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.321 by root, Sat Nov 22 02:09:54 2008 UTC vs.
Revision 1.399 by root, Thu May 12 23:24:28 2011 UTC

1#define CORO_CLONE 1 //D 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
2 5
3#include "libcoro/coro.c" 6#include "libcoro/coro.c"
4 7
5#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
6#define PERL_EXT 9#define PERL_EXT
… …
8#include "EXTERN.h" 11#include "EXTERN.h"
9#include "perl.h" 12#include "perl.h"
10#include "XSUB.h" 13#include "XSUB.h"
11#include "perliol.h" 14#include "perliol.h"
12 15
13#include "patchlevel.h" 16#include "schmorp.h"
14 17
15#include <stdio.h> 18#include <stdio.h>
16#include <errno.h> 19#include <errno.h>
17#include <assert.h> 20#include <assert.h>
18 21
19#ifdef WIN32 22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
25
26#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY
20# undef setjmp 28# undef setjmp
21# undef longjmp 29# undef longjmp
22# undef _exit 30# undef _exit
23# define setjmp _setjmp /* deep magic */ 31# define setjmp _setjmp /* deep magic */
24#else 32#else
… …
53#endif 61#endif
54 62
55/* the maximum number of idle cctx that will be pooled */ 63/* the maximum number of idle cctx that will be pooled */
56static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
57 65
58#define PERL_VERSION_ATLEAST(a,b,c) \
59 (PERL_REVISION > (a) \
60 || (PERL_REVISION == (a) \
61 && (PERL_VERSION > (b) \
62 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
63
64#if !PERL_VERSION_ATLEAST (5,6,0)
65# ifndef PL_ppaddr
66# define PL_ppaddr ppaddr
67# endif
68# ifndef call_sv
69# define call_sv perl_call_sv
70# endif
71# ifndef get_sv
72# define get_sv perl_get_sv
73# endif
74# ifndef get_cv
75# define get_cv perl_get_cv
76# endif
77# ifndef IS_PADGV
78# define IS_PADGV(v) 0
79# endif
80# ifndef IS_PADCONST
81# define IS_PADCONST(v) 0
82# endif
83#endif
84
85/* 5.11 */
86#ifndef CxHASARGS
87# define CxHASARGS(cx) (cx)->blk_sub.hasargs
88#endif
89
90/* 5.10.0 */
91#ifndef SvREFCNT_inc_NN
92# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
93#endif
94
95/* 5.8.8 */
96#ifndef GV_NOTQUAL
97# define GV_NOTQUAL 0
98#endif
99#ifndef newSV
100# define newSV(l) NEWSV(0,l)
101#endif
102#ifndef CvISXSUB_on
103# define CvISXSUB_on(cv) (void)cv
104#endif
105#ifndef CvISXSUB
106# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
107#endif
108#ifndef Newx
109# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
110#endif
111
112/* 5.8.7 */
113#ifndef SvRV_set
114# define SvRV_set(s,v) SvRV(s) = (v)
115#endif
116
117#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
118# undef CORO_STACKGUARD 67# undef CORO_STACKGUARD
119#endif 68#endif
120 69
121#ifndef CORO_STACKGUARD 70#ifndef CORO_STACKGUARD
… …
135#else 84#else
136# define dSTACKLEVEL volatile void *stacklevel 85# define dSTACKLEVEL volatile void *stacklevel
137# define STACKLEVEL ((void *)&stacklevel) 86# define STACKLEVEL ((void *)&stacklevel)
138#endif 87#endif
139 88
140#define IN_DESTRUCT (PL_main_cv == Nullcv) 89#define IN_DESTRUCT PL_dirty
141 90
142#if __GNUC__ >= 3 91#if __GNUC__ >= 3
143# define attribute(x) __attribute__(x) 92# define attribute(x) __attribute__(x)
144# define expect(expr,value) __builtin_expect ((expr),(value)) 93# define expect(expr,value) __builtin_expect ((expr), (value))
145# define INLINE static inline 94# define INLINE static inline
146#else 95#else
147# define attribute(x) 96# define attribute(x)
148# define expect(expr,value) (expr) 97# define expect(expr,value) (expr)
149# define INLINE static 98# define INLINE static
… …
161# if CORO_PTHREAD 110# if CORO_PTHREAD
162static void *coro_thx; 111static void *coro_thx;
163# endif 112# endif
164#endif 113#endif
165 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
166static 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]);
167 127
168/* we hijack an hopefully unused CV flag for our purposes */ 128/* we hijack an hopefully unused CV flag for our purposes */
169#define CVf_SLF 0x4000 129#define CVf_SLF 0x4000
170static OP *pp_slf (pTHX); 130static OP *pp_slf (pTHX);
131static void slf_destroy (pTHX_ struct coro *coro);
171 132
172static U32 cctx_gen; 133static U32 cctx_gen;
173static size_t cctx_stacksize = CORO_STACKSIZE; 134static size_t cctx_stacksize = CORO_STACKSIZE;
174static struct CoroAPI coroapi; 135static struct CoroAPI coroapi;
175static AV *main_mainstack; /* used to differentiate between $main and others */ 136static AV *main_mainstack; /* used to differentiate between $main and others */
… …
177static HV *coro_state_stash, *coro_stash; 138static HV *coro_state_stash, *coro_stash;
178static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 139static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
179 140
180static AV *av_destroy; /* destruction queue */ 141static AV *av_destroy; /* destruction queue */
181static SV *sv_manager; /* the manager coro */ 142static SV *sv_manager; /* the manager coro */
143static SV *sv_idle; /* $Coro::idle */
182 144
183static GV *irsgv; /* $/ */ 145static GV *irsgv; /* $/ */
184static GV *stdoutgv; /* *STDOUT */ 146static GV *stdoutgv; /* *STDOUT */
185static SV *rv_diehook; 147static SV *rv_diehook;
186static SV *rv_warnhook; 148static SV *rv_warnhook;
… …
191static SV *sv_pool_size; 153static SV *sv_pool_size;
192static SV *sv_async_pool_idle; /* description string */ 154static SV *sv_async_pool_idle; /* description string */
193static AV *av_async_pool; /* idle pool */ 155static AV *av_async_pool; /* idle pool */
194static SV *sv_Coro; /* class string */ 156static SV *sv_Coro; /* class string */
195static CV *cv_pool_handler; 157static CV *cv_pool_handler;
196static CV *cv_coro_state_new;
197 158
198/* Coro::AnyEvent */ 159/* Coro::AnyEvent */
199static SV *sv_activity; 160static SV *sv_activity;
200 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
201static struct coro_cctx *cctx_first; 168static struct coro_cctx *cctx_first;
202static int cctx_count, cctx_idle; 169static int cctx_count, cctx_idle;
203 170
204enum { 171enum
172{
205 CC_MAPPED = 0x01, 173 CC_MAPPED = 0x01,
206 CC_NOREUSE = 0x02, /* throw this away after tracing */ 174 CC_NOREUSE = 0x02, /* throw this away after tracing */
207 CC_TRACE = 0x04, 175 CC_TRACE = 0x04,
208 CC_TRACE_SUB = 0x08, /* trace sub calls */ 176 CC_TRACE_SUB = 0x08, /* trace sub calls */
209 CC_TRACE_LINE = 0x10, /* trace each statement */ 177 CC_TRACE_LINE = 0x10, /* trace each statement */
… …
230 int valgrind_id; 198 int valgrind_id;
231#endif 199#endif
232 unsigned char flags; 200 unsigned char flags;
233} coro_cctx; 201} coro_cctx;
234 202
203static coro_cctx *cctx_current; /* the currently running cctx */
204
205/*****************************************************************************/
206
207static MGVTBL coro_state_vtbl;
208
235enum { 209enum
210{
236 CF_RUNNING = 0x0001, /* coroutine is running */ 211 CF_RUNNING = 0x0001, /* coroutine is running */
237 CF_READY = 0x0002, /* coroutine is ready */ 212 CF_READY = 0x0002, /* coroutine is ready */
238 CF_NEW = 0x0004, /* has never been switched to */ 213 CF_NEW = 0x0004, /* has never been switched to */
239 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) */
240}; 217};
241 218
242/* 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 */
243typedef struct 220typedef struct
244{ 221{
245 SV *defsv; 222 SV *defsv;
246 AV *defav; 223 AV *defav;
247 SV *errsv; 224 SV *errsv;
248 SV *irsgv; 225 SV *irsgv;
226 HV *hinthv;
249#define VAR(name,type) type name; 227#define VAR(name,type) type name;
250# include "state.h" 228# include "state.h"
251#undef VAR 229#undef VAR
252} perl_slots; 230} perl_slots;
253 231
232// how many context stack entries do we need for perl_slots
254#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))
255 234
256/* this is a structure representing a perl-level coroutine */ 235/* this is a structure representing a perl-level coroutine */
257struct coro { 236struct coro
237{
258 /* the C coroutine allocated to this perl coroutine, if any */ 238 /* the C coroutine allocated to this perl coroutine, if any */
259 coro_cctx *cctx; 239 coro_cctx *cctx;
240
241 /* ready queue */
242 struct coro *next_ready;
260 243
261 /* state data */ 244 /* state data */
262 struct CoroSLF slf_frame; /* saved slf frame */ 245 struct CoroSLF slf_frame; /* saved slf frame */
263 AV *mainstack; 246 AV *mainstack;
264 perl_slots *slot; /* basically the saved sp */ 247 perl_slots *slot; /* basically the saved sp */
265 248
266 CV *startcv; /* the CV to execute */ 249 CV *startcv; /* the CV to execute */
267 AV *args; /* data associated with this coroutine (initial args) */ 250 AV *args; /* data associated with this coroutine (initial args) */
268 int refcnt; /* coroutines are refcounted, yes */
269 int flags; /* CF_ flags */ 251 int flags; /* CF_ flags */
270 HV *hv; /* the perl hash associated with this coro, if any */ 252 HV *hv; /* the perl hash associated with this coro, if any */
271 void (*on_destroy)(pTHX_ struct coro *coro);
272 253
273 /* statistics */ 254 /* statistics */
274 int usecount; /* number of transfers to this coro */ 255 int usecount; /* number of transfers to this coro */
275 256
276 /* coro process data */ 257 /* coro process data */
277 int prio; 258 int prio;
278 SV *except; /* exception to be thrown */ 259 SV *except; /* exception to be thrown */
279 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 */
280 263
281 /* async_pool */ 264 /* async_pool */
282 SV *saved_deffh; 265 SV *saved_deffh;
283 SV *invoke_cb; 266 SV *invoke_cb;
284 AV *invoke_av; 267 AV *invoke_av;
285 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
286 /* linked list */ 279 /* linked list */
287 struct coro *next, *prev; 280 struct coro *next, *prev;
288}; 281};
289 282
290typedef struct coro *Coro__State; 283typedef struct coro *Coro__State;
291typedef struct coro *Coro__State_or_hashref; 284typedef struct coro *Coro__State_or_hashref;
292 285
293/* the following variables are effectively part of the perl context */ 286/* the following variables are effectively part of the perl context */
294/* and get copied between struct coro and these variables */ 287/* and get copied between struct coro and these variables */
295/* the mainr easonw e don't support windows process emulation */ 288/* the main reason we don't support windows process emulation */
296static struct CoroSLF slf_frame; /* the current slf frame */ 289static struct CoroSLF slf_frame; /* the current slf frame */
297 290
298/** Coro ********************************************************************/ 291/** Coro ********************************************************************/
299 292
300#define PRIO_MAX 3 293#define CORO_PRIO_MAX 3
301#define PRIO_HIGH 1 294#define CORO_PRIO_HIGH 1
302#define PRIO_NORMAL 0 295#define CORO_PRIO_NORMAL 0
303#define PRIO_LOW -1 296#define CORO_PRIO_LOW -1
304#define PRIO_IDLE -3 297#define CORO_PRIO_IDLE -3
305#define PRIO_MIN -4 298#define CORO_PRIO_MIN -4
306 299
307/* for Coro.pm */ 300/* for Coro.pm */
308static SV *coro_current; 301static SV *coro_current;
309static SV *coro_readyhook; 302static SV *coro_readyhook;
310static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 303static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
311static CV *cv_coro_run, *cv_coro_terminate; 304static CV *cv_coro_run;
312static struct coro *coro_first; 305static struct coro *coro_first;
313#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
314 379
315/** lowlevel stuff **********************************************************/ 380/** lowlevel stuff **********************************************************/
316 381
317static SV * 382static SV *
318coro_get_sv (pTHX_ const char *name, int create) 383coro_get_sv (pTHX_ const char *name, int create)
… …
342 get_hv (name, create); 407 get_hv (name, create);
343#endif 408#endif
344 return get_hv (name, create); 409 return get_hv (name, create);
345} 410}
346 411
347/* 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
348INLINE CV * 478INLINE MAGIC *
349coro_sv_2cv (pTHX_ SV *sv) 479SvSTATEhv_p (pTHX_ SV *coro)
350{ 480{
351 HV *st; 481 MAGIC *mg;
352 GV *gvp; 482
353 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;
354} 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 */
355 516
356static AV * 517static AV *
357coro_derive_padlist (pTHX_ CV *cv) 518coro_derive_padlist (pTHX_ CV *cv)
358{ 519{
359 AV *padlist = CvPADLIST (cv); 520 AV *padlist = CvPADLIST (cv);
… …
367 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 528 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
368#endif 529#endif
369 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 530 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
370 --AvFILLp (padlist); 531 --AvFILLp (padlist);
371 532
372 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 533 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
373 av_store (newpadlist, 1, (SV *)newpad); 534 av_store (newpadlist, 1, (SV *)newpad);
374 535
375 return newpadlist; 536 return newpadlist;
376} 537}
377 538
378static void 539static void
379free_padlist (pTHX_ AV *padlist) 540free_padlist (pTHX_ AV *padlist)
380{ 541{
381 /* may be during global destruction */ 542 /* may be during global destruction */
382 if (SvREFCNT (padlist)) 543 if (!IN_DESTRUCT)
383 { 544 {
384 I32 i = AvFILLp (padlist); 545 I32 i = AvFILLp (padlist);
385 while (i >= 0) 546
547 while (i > 0) /* special-case index 0 */
386 { 548 {
387 SV **svp = av_fetch (padlist, i--, FALSE); 549 /* we try to be extra-careful here */
388 if (svp) 550 AV *av = (AV *)AvARRAY (padlist)[i--];
389 { 551 I32 j = AvFILLp (av);
390 SV *sv; 552
391 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 553 while (j >= 0)
554 SvREFCNT_dec (AvARRAY (av)[j--]);
555
556 AvFILLp (av) = -1;
392 SvREFCNT_dec (sv); 557 SvREFCNT_dec (av);
393
394 SvREFCNT_dec (*svp);
395 }
396 } 558 }
397 559
560 SvREFCNT_dec (AvARRAY (padlist)[0]);
561
562 AvFILLp (padlist) = -1;
398 SvREFCNT_dec ((SV*)padlist); 563 SvREFCNT_dec ((SV*)padlist);
399 } 564 }
400} 565}
401 566
402static int 567static int
403coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 568coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
404{ 569{
405 AV *padlist; 570 AV *padlist;
406 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;
407 576
408 /* casting is fun. */ 577 /* casting is fun. */
409 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 578 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
410 free_padlist (aTHX_ padlist); 579 free_padlist (aTHX_ padlist);
411 580
412 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 581 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
413 582
414 return 0; 583 return 0;
415} 584}
416
417#define CORO_MAGIC_type_cv 26
418#define CORO_MAGIC_type_state PERL_MAGIC_ext
419 585
420static MGVTBL coro_cv_vtbl = { 586static MGVTBL coro_cv_vtbl = {
421 0, 0, 0, 0, 587 0, 0, 0, 0,
422 coro_cv_free 588 coro_cv_free
423}; 589};
424
425#define CORO_MAGIC_NN(sv, type) \
426 (expect_true (SvMAGIC (sv)->mg_type == type) \
427 ? SvMAGIC (sv) \
428 : mg_find (sv, type))
429
430#define CORO_MAGIC(sv, type) \
431 (expect_true (SvMAGIC (sv)) \
432 ? CORO_MAGIC_NN (sv, type) \
433 : 0)
434
435#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
436#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
437
438INLINE struct coro *
439SvSTATE_ (pTHX_ SV *coro)
440{
441 HV *stash;
442 MAGIC *mg;
443
444 if (SvROK (coro))
445 coro = SvRV (coro);
446
447 if (expect_false (SvTYPE (coro) != SVt_PVHV))
448 croak ("Coro::State object required");
449
450 stash = SvSTASH (coro);
451 if (expect_false (stash != coro_stash && stash != coro_state_stash))
452 {
453 /* very slow, but rare, check */
454 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
455 croak ("Coro::State object required");
456 }
457
458 mg = CORO_MAGIC_state (coro);
459 return (struct coro *)mg->mg_ptr;
460}
461
462#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
463
464/* faster than SvSTATE, but expects a coroutine hv */
465#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
466#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
467 590
468/* the next two functions merely cache the padlists */ 591/* the next two functions merely cache the padlists */
469static void 592static void
470get_padlist (pTHX_ CV *cv) 593get_padlist (pTHX_ CV *cv)
471{ 594{
… …
499 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);
500 623
501 av = (AV *)mg->mg_obj; 624 av = (AV *)mg->mg_obj;
502 625
503 if (expect_false (AvFILLp (av) >= AvMAX (av))) 626 if (expect_false (AvFILLp (av) >= AvMAX (av)))
504 av_extend (av, AvMAX (av) + 1); 627 av_extend (av, AvFILLp (av) + 1);
505 628
506 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 629 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
507} 630}
508 631
509/** 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);
510 687
511static void 688static void
512load_perl (pTHX_ Coro__State c) 689load_perl (pTHX_ Coro__State c)
513{ 690{
514 perl_slots *slot = c->slot; 691 perl_slots *slot = c->slot;
515 c->slot = 0; 692 c->slot = 0;
516 693
517 PL_mainstack = c->mainstack; 694 PL_mainstack = c->mainstack;
518 695
519 GvSV (PL_defgv) = slot->defsv; 696 GvSV (PL_defgv) = slot->defsv;
520 GvAV (PL_defgv) = slot->defav; 697 GvAV (PL_defgv) = slot->defav;
521 GvSV (PL_errgv) = slot->errsv; 698 GvSV (PL_errgv) = slot->errsv;
522 GvSV (irsgv) = slot->irsgv; 699 GvSV (irsgv) = slot->irsgv;
700 GvHV (PL_hintgv) = slot->hinthv;
523 701
524 #define VAR(name,type) PL_ ## name = slot->name; 702 #define VAR(name,type) PL_ ## name = slot->name;
525 # include "state.h" 703 # include "state.h"
526 #undef VAR 704 #undef VAR
527 705
… …
541 PUTBACK; 719 PUTBACK;
542 } 720 }
543 721
544 slf_frame = c->slf_frame; 722 slf_frame = c->slf_frame;
545 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);
546} 742}
547 743
548static void 744static void
549save_perl (pTHX_ Coro__State c) 745save_perl (pTHX_ Coro__State c)
550{ 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
551 c->except = CORO_THROW; 765 c->except = CORO_THROW;
552 c->slf_frame = slf_frame; 766 c->slf_frame = slf_frame;
553 767
554 { 768 {
555 dSP; 769 dSP;
… …
568 { 782 {
569 while (expect_true (cxix >= 0)) 783 while (expect_true (cxix >= 0))
570 { 784 {
571 PERL_CONTEXT *cx = &ccstk[cxix--]; 785 PERL_CONTEXT *cx = &ccstk[cxix--];
572 786
573 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))
574 { 788 {
575 CV *cv = cx->blk_sub.cv; 789 CV *cv = cx->blk_sub.cv;
576 790
577 if (expect_true (CvDEPTH (cv))) 791 if (expect_true (CvDEPTH (cv)))
578 { 792 {
… …
597 811
598 PUTBACK; 812 PUTBACK;
599 } 813 }
600 814
601 /* allocate some space on the context stack for our purposes */ 815 /* allocate some space on the context stack for our purposes */
602 /* we manually unroll here, as usually 2 slots is enough */ 816 if (expect_false (cxstack_ix + SLOT_COUNT >= cxstack_max))
603 if (SLOT_COUNT >= 1) CXINC;
604 if (SLOT_COUNT >= 2) CXINC;
605 if (SLOT_COUNT >= 3) CXINC;
606 { 817 {
607 int i; 818 unsigned int i;
819
608 for (i = 3; i < SLOT_COUNT; ++i) 820 for (i = 0; i < SLOT_COUNT; ++i)
609 CXINC; 821 CXINC;
610 } 822
611 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 823 cxstack_ix -= SLOT_COUNT; /* undo allocation */
824 }
612 825
613 c->mainstack = PL_mainstack; 826 c->mainstack = PL_mainstack;
614 827
615 { 828 {
616 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 829 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
617 830
618 slot->defav = GvAV (PL_defgv); 831 slot->defav = GvAV (PL_defgv);
619 slot->defsv = DEFSV; 832 slot->defsv = DEFSV;
620 slot->errsv = ERRSV; 833 slot->errsv = ERRSV;
621 slot->irsgv = GvSV (irsgv); 834 slot->irsgv = GvSV (irsgv);
835 slot->hinthv = GvHV (PL_hintgv);
622 836
623 #define VAR(name,type) slot->name = PL_ ## name; 837 #define VAR(name,type) slot->name = PL_ ## name;
624 # include "state.h" 838 # include "state.h"
625 #undef VAR 839 #undef VAR
626 } 840 }
… …
636# define coro_init_stacks(thx) init_stacks () 850# define coro_init_stacks(thx) init_stacks ()
637#else 851#else
638static void 852static void
639coro_init_stacks (pTHX) 853coro_init_stacks (pTHX)
640{ 854{
641 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() */
642 PL_curstackinfo->si_type = PERLSI_MAIN; 856 PL_curstackinfo->si_type = PERLSI_MAIN;
643 PL_curstack = PL_curstackinfo->si_stack; 857 PL_curstack = PL_curstackinfo->si_stack;
644 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 858 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
645 859
646 PL_stack_base = AvARRAY(PL_curstack); 860 PL_stack_base = AvARRAY(PL_curstack);
… …
753#endif 967#endif
754 968
755/* 969/*
756 * This overrides the default magic get method of %SIG elements. 970 * This overrides the default magic get method of %SIG elements.
757 * 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
758 * 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
759 * readback here. 973 * readback here.
760 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
761 * not expecting this to actually change the hook. This is a potential problem
762 * when a schedule happens then, but we ignore this.
763 */ 974 */
764static int 975static int
765coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 976coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
766{ 977{
767 const char *s = MgPV_nolen_const (mg); 978 const char *s = MgPV_nolen_const (mg);
… …
820 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1031 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
821 1032
822 if (svp) 1033 if (svp)
823 { 1034 {
824 SV *old = *svp; 1035 SV *old = *svp;
825 *svp = newSVsv (sv); 1036 *svp = SvOK (sv) ? newSVsv (sv) : 0;
826 SvREFCNT_dec (old); 1037 SvREFCNT_dec (old);
827 return 0; 1038 return 0;
828 } 1039 }
829 } 1040 }
830 1041
… …
848slf_check_repeat (pTHX_ struct CoroSLF *frame) 1059slf_check_repeat (pTHX_ struct CoroSLF *frame)
849{ 1060{
850 return 1; 1061 return 1;
851} 1062}
852 1063
853static UNOP coro_setup_op; 1064static UNOP init_perl_op;
854 1065
855static 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 */
856coro_setup (pTHX_ struct coro *coro) 1067init_perl (pTHX_ struct coro *coro)
857{ 1068{
858 /* 1069 /*
859 * emulate part of the perl startup here. 1070 * emulate part of the perl startup here.
860 */ 1071 */
861 coro_init_stacks (aTHX); 1072 coro_init_stacks (aTHX);
862 1073
863 PL_runops = RUNOPS_DEFAULT; 1074 PL_runops = RUNOPS_DEFAULT;
864 PL_curcop = &PL_compiling; 1075 PL_curcop = &PL_compiling;
865 PL_in_eval = EVAL_NULL; 1076 PL_in_eval = EVAL_NULL;
866 PL_comppad = 0; 1077 PL_comppad = 0;
1078 PL_comppad_name = 0;
1079 PL_comppad_name_fill = 0;
1080 PL_comppad_name_floor = 0;
867 PL_curpm = 0; 1081 PL_curpm = 0;
868 PL_curpad = 0; 1082 PL_curpad = 0;
869 PL_localizing = 0; 1083 PL_localizing = 0;
870 PL_dirty = 0;
871 PL_restartop = 0; 1084 PL_restartop = 0;
872#if PERL_VERSION_ATLEAST (5,10,0) 1085#if PERL_VERSION_ATLEAST (5,10,0)
873 PL_parser = 0; 1086 PL_parser = 0;
874#endif 1087#endif
1088 PL_hints = 0;
875 1089
876 /* recreate the die/warn hooks */ 1090 /* recreate the die/warn hooks */
877 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 );
878 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);
879 1093
880 GvSV (PL_defgv) = newSV (0); 1094 GvSV (PL_defgv) = newSV (0);
881 GvAV (PL_defgv) = coro->args; coro->args = 0; 1095 GvAV (PL_defgv) = coro->args; coro->args = 0;
882 GvSV (PL_errgv) = newSV (0); 1096 GvSV (PL_errgv) = newSV (0);
883 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;
884 PL_rs = newSVsv (GvSV (irsgv)); 1099 PL_rs = newSVsv (GvSV (irsgv));
885 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1100 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
886 1101
887 { 1102 {
888 dSP; 1103 dSP;
… …
903 /* 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
904 * 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.
905 */ 1120 */
906 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 */
907 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;
908 1124
909 /* 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 */
910 coro_setup_op.op_next = PL_op; 1126 init_perl_op.op_next = PL_op;
911 coro_setup_op.op_type = OP_ENTERSUB; 1127 init_perl_op.op_type = OP_ENTERSUB;
912 coro_setup_op.op_ppaddr = pp_slf; 1128 init_perl_op.op_ppaddr = pp_slf;
913 /* 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 */
914 1130
915 PL_op = (OP *)&coro_setup_op; 1131 PL_op = (OP *)&init_perl_op;
916 1132
917 /* copy throw, in case it was set before coro_setup */ 1133 /* copy throw, in case it was set before init_perl */
918 CORO_THROW = coro->except; 1134 CORO_THROW = coro->except;
919}
920 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
921static void 1145static void
922coro_destruct (pTHX_ struct coro *coro) 1146coro_unwind_stacks (pTHX)
923{ 1147{
924 if (!IN_DESTRUCT) 1148 if (!IN_DESTRUCT)
925 { 1149 {
926 /* restore all saved variables and stuff */ 1150 /* restore all saved variables and stuff */
927 LEAVE_SCOPE (0); 1151 LEAVE_SCOPE (0);
… …
935 POPSTACK_TO (PL_mainstack); 1159 POPSTACK_TO (PL_mainstack);
936 1160
937 /* unwind main stack */ 1161 /* unwind main stack */
938 dounwind (-1); 1162 dounwind (-1);
939 } 1163 }
1164}
940 1165
941 SvREFCNT_dec (GvSV (PL_defgv)); 1166static void
942 SvREFCNT_dec (GvAV (PL_defgv)); 1167destroy_perl (pTHX_ struct coro *coro)
943 SvREFCNT_dec (GvSV (PL_errgv)); 1168{
944 SvREFCNT_dec (PL_defoutgv); 1169 SV *svf [9];
945 SvREFCNT_dec (PL_rs);
946 SvREFCNT_dec (GvSV (irsgv));
947 1170
948 SvREFCNT_dec (PL_diehook);
949 SvREFCNT_dec (PL_warnhook);
950 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
951 SvREFCNT_dec (coro->saved_deffh); 1214 SvREFCNT_dec (coro->saved_deffh);
952 SvREFCNT_dec (coro->rouse_cb); 1215 SvREFCNT_dec (coro->rouse_cb);
953 SvREFCNT_dec (coro->invoke_cb); 1216 SvREFCNT_dec (coro->invoke_cb);
954 SvREFCNT_dec (coro->invoke_av); 1217 SvREFCNT_dec (coro->invoke_av);
955 1218 }
956 coro_destruct_stacks (aTHX);
957} 1219}
958 1220
959INLINE void 1221INLINE void
960free_coro_mortal (pTHX) 1222free_coro_mortal (pTHX)
961{ 1223{
962 if (expect_true (coro_mortal)) 1224 if (expect_true (coro_mortal))
963 { 1225 {
964 SvREFCNT_dec (coro_mortal); 1226 SvREFCNT_dec ((SV *)coro_mortal);
965 coro_mortal = 0; 1227 coro_mortal = 0;
966 } 1228 }
967} 1229}
968 1230
969static int 1231static int
970runops_trace (pTHX) 1232runops_trace (pTHX)
971{ 1233{
972 COP *oldcop = 0; 1234 COP *oldcop = 0;
973 int oldcxix = -2; 1235 int oldcxix = -2;
974 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
975 coro_cctx *cctx = coro->cctx;
976 1236
977 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1237 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
978 { 1238 {
979 PERL_ASYNC_CHECK (); 1239 PERL_ASYNC_CHECK ();
980 1240
981 if (cctx->flags & CC_TRACE_ALL) 1241 if (cctx_current->flags & CC_TRACE_ALL)
982 { 1242 {
983 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)
984 { 1244 {
985 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1245 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
986 SV **bot, **top; 1246 SV **bot, **top;
987 AV *av = newAV (); /* return values */ 1247 AV *av = newAV (); /* return values */
988 SV **cb; 1248 SV **cb;
… …
1025 1285
1026 if (PL_curcop != &PL_compiling) 1286 if (PL_curcop != &PL_compiling)
1027 { 1287 {
1028 SV **cb; 1288 SV **cb;
1029 1289
1030 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1290 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1031 { 1291 {
1032 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1292 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1033 1293
1034 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1294 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1035 { 1295 {
… …
1058 } 1318 }
1059 1319
1060 oldcxix = cxstack_ix; 1320 oldcxix = cxstack_ix;
1061 } 1321 }
1062 1322
1063 if (cctx->flags & CC_TRACE_LINE) 1323 if (cctx_current->flags & CC_TRACE_LINE)
1064 { 1324 {
1065 dSP; 1325 dSP;
1066 1326
1067 PL_runops = RUNOPS_DEFAULT; 1327 PL_runops = RUNOPS_DEFAULT;
1068 ENTER; 1328 ENTER;
… …
1087 1347
1088 TAINT_NOT; 1348 TAINT_NOT;
1089 return 0; 1349 return 0;
1090} 1350}
1091 1351
1092static struct coro_cctx *cctx_ssl_cctx;
1093static struct CoroSLF cctx_ssl_frame; 1352static struct CoroSLF cctx_ssl_frame;
1094 1353
1095static void 1354static void
1096slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1355slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1097{ 1356{
1098 ta->prev = (struct coro *)cctx_ssl_cctx;
1099 ta->next = 0; 1357 ta->prev = 0;
1100} 1358}
1101 1359
1102static int 1360static int
1103slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1361slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1104{ 1362{
… …
1107 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 */
1108} 1366}
1109 1367
1110/* 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 */
1111static void NOINLINE 1369static void NOINLINE
1112cctx_prepare (pTHX_ coro_cctx *cctx) 1370cctx_prepare (pTHX)
1113{ 1371{
1114 PL_top_env = &PL_start_env; 1372 PL_top_env = &PL_start_env;
1115 1373
1116 if (cctx->flags & CC_TRACE) 1374 if (cctx_current->flags & CC_TRACE)
1117 PL_runops = runops_trace; 1375 PL_runops = runops_trace;
1118 1376
1119 /* 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
1120 * that can lead to creation of a new cctx */ 1378 * that can lead to creation of a new cctx */
1121 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)",
1122 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1380 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1123 1381
1124 /* 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 */
1125 cctx_ssl_cctx = cctx;
1126 cctx_ssl_frame = slf_frame; 1383 cctx_ssl_frame = slf_frame;
1127 1384
1128 slf_frame.prepare = slf_prepare_set_stacklevel; 1385 slf_frame.prepare = slf_prepare_set_stacklevel;
1129 slf_frame.check = slf_check_set_stacklevel; 1386 slf_frame.check = slf_check_set_stacklevel;
1130} 1387}
… …
1153 /* normally we would need to skip the entersub here */ 1410 /* normally we would need to skip the entersub here */
1154 /* 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 */
1155 /* PL_nop = PL_nop->op_next */ 1412 /* PL_nop = PL_nop->op_next */
1156 1413
1157 /* inject a fake subroutine call to cctx_init */ 1414 /* inject a fake subroutine call to cctx_init */
1158 cctx_prepare (aTHX_ (coro_cctx *)arg); 1415 cctx_prepare (aTHX);
1159 1416
1160 /* cctx_run is the alternative tail of transfer() */ 1417 /* cctx_run is the alternative tail of transfer() */
1161 transfer_tail (aTHX); 1418 transfer_tail (aTHX);
1162 1419
1163 /* 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 */
1164 PL_restartop = PL_op; 1421 PL_restartop = PL_op;
1165 perl_run (PL_curinterp); 1422 perl_run (PL_curinterp);
1166 /* 1423 /*
1167 * 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
1168 * 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.
1169 */ 1427 */
1170 1428
1171 /* 1429 /*
1172 * 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
1173 * 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)
1174 * 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
1175 * bootstrap-time "top" top_env, as we cannot restore the "main" 1433 * bootstrap-time "top" top_env, as we cannot restore the "main"
1176 * 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.
1177 */ 1437 */
1178 PL_top_env = main_top_env; 1438 PL_top_env = main_top_env;
1179 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 */
1180 } 1440 }
1181} 1441}
… …
1258cctx_destroy (coro_cctx *cctx) 1518cctx_destroy (coro_cctx *cctx)
1259{ 1519{
1260 if (!cctx) 1520 if (!cctx)
1261 return; 1521 return;
1262 1522
1523 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1524
1263 --cctx_count; 1525 --cctx_count;
1264 coro_destroy (&cctx->cctx); 1526 coro_destroy (&cctx->cctx);
1265 1527
1266 /* coro_transfer creates new, empty cctx's */ 1528 /* coro_transfer creates new, empty cctx's */
1267 if (cctx->sptr) 1529 if (cctx->sptr)
… …
1330 /* TODO: throwing up here is considered harmful */ 1592 /* TODO: throwing up here is considered harmful */
1331 1593
1332 if (expect_true (prev != next)) 1594 if (expect_true (prev != next))
1333 { 1595 {
1334 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1596 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1335 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,");
1336 1598
1337 if (expect_false (next->flags & CF_RUNNING))
1338 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1339
1340 if (expect_false (next->flags & CF_DESTROYED)) 1599 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1341 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,");
1342 1601
1343#if !PERL_VERSION_ATLEAST (5,10,0) 1602#if !PERL_VERSION_ATLEAST (5,10,0)
1344 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1603 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1345 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,");
1346#endif 1605#endif
… …
1352transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1611transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1353{ 1612{
1354 dSTACKLEVEL; 1613 dSTACKLEVEL;
1355 1614
1356 /* sometimes transfer is only called to set idle_sp */ 1615 /* sometimes transfer is only called to set idle_sp */
1357 if (expect_false (!next)) 1616 if (expect_false (!prev))
1358 { 1617 {
1359 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1618 cctx_current->idle_sp = STACKLEVEL;
1360 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 */
1361 } 1620 }
1362 else if (expect_true (prev != next)) 1621 else if (expect_true (prev != next))
1363 { 1622 {
1364 coro_cctx *prev__cctx; 1623 coro_cctx *cctx_prev;
1365 1624
1366 if (expect_false (prev->flags & CF_NEW)) 1625 if (expect_false (prev->flags & CF_NEW))
1367 { 1626 {
1368 /* create a new empty/source context */ 1627 /* create a new empty/source context */
1369 prev->cctx = cctx_new_empty ();
1370 prev->flags &= ~CF_NEW; 1628 prev->flags &= ~CF_NEW;
1371 prev->flags |= CF_RUNNING; 1629 prev->flags |= CF_RUNNING;
1372 } 1630 }
1373 1631
1374 prev->flags &= ~CF_RUNNING; 1632 prev->flags &= ~CF_RUNNING;
… …
1380 if (expect_false (next->flags & CF_NEW)) 1638 if (expect_false (next->flags & CF_NEW))
1381 { 1639 {
1382 /* need to start coroutine */ 1640 /* need to start coroutine */
1383 next->flags &= ~CF_NEW; 1641 next->flags &= ~CF_NEW;
1384 /* setup coroutine call */ 1642 /* setup coroutine call */
1385 coro_setup (aTHX_ next); 1643 init_perl (aTHX_ next);
1386 } 1644 }
1387 else 1645 else
1388 load_perl (aTHX_ next); 1646 load_perl (aTHX_ next);
1389 1647
1390 prev__cctx = prev->cctx;
1391
1392 /* possibly untie and reuse the cctx */ 1648 /* possibly untie and reuse the cctx */
1393 if (expect_true ( 1649 if (expect_true (
1394 prev__cctx->idle_sp == STACKLEVEL 1650 cctx_current->idle_sp == STACKLEVEL
1395 && !(prev__cctx->flags & CC_TRACE) 1651 && !(cctx_current->flags & CC_TRACE)
1396 && !force_cctx 1652 && !force_cctx
1397 )) 1653 ))
1398 { 1654 {
1399 /* 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 */
1400 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));
1401 1657
1402 prev->cctx = 0;
1403
1404 /* 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. */
1405 /* 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 */
1406 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1660 if (expect_false (CCTX_EXPIRED (cctx_current)))
1407 if (!next->cctx) 1661 if (expect_true (!next->cctx))
1408 next->cctx = cctx_get (aTHX); 1662 next->cctx = cctx_get (aTHX);
1409 1663
1410 cctx_put (prev__cctx); 1664 cctx_put (cctx_current);
1411 } 1665 }
1666 else
1667 prev->cctx = cctx_current;
1412 1668
1413 ++next->usecount; 1669 ++next->usecount;
1414 1670
1415 if (expect_true (!next->cctx)) 1671 cctx_prev = cctx_current;
1416 next->cctx = cctx_get (aTHX); 1672 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1417 1673
1418 if (expect_false (prev__cctx != next->cctx)) 1674 next->cctx = 0;
1675
1676 if (expect_false (cctx_prev != cctx_current))
1419 { 1677 {
1420 prev__cctx->top_env = PL_top_env; 1678 cctx_prev->top_env = PL_top_env;
1421 PL_top_env = next->cctx->top_env; 1679 PL_top_env = cctx_current->top_env;
1422 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1680 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1423 } 1681 }
1424 1682
1425 transfer_tail (aTHX); 1683 transfer_tail (aTHX);
1426 } 1684 }
1427} 1685}
… …
1429#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))
1430#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1688#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1431 1689
1432/** high level stuff ********************************************************/ 1690/** high level stuff ********************************************************/
1433 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 */
1434static int 1694static void
1695coro_call_on_destroy (pTHX_ struct coro *coro);
1696
1697static void
1435coro_state_destroy (pTHX_ struct coro *coro) 1698coro_state_destroy (pTHX_ struct coro *coro)
1436{ 1699{
1437 if (coro->flags & CF_DESTROYED) 1700 if (coro->flags & CF_DESTROYED)
1438 return 0; 1701 return;
1439 1702
1440 if (coro->on_destroy)
1441 coro->on_destroy (aTHX_ coro); 1703 slf_destroy (aTHX_ coro);
1442 1704
1443 coro->flags |= CF_DESTROYED; 1705 coro->flags |= CF_DESTROYED;
1444 1706
1445 if (coro->flags & CF_READY) 1707 if (coro->flags & CF_READY)
1446 { 1708 {
… …
1449 --coro_nready; 1711 --coro_nready;
1450 } 1712 }
1451 else 1713 else
1452 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 */
1453 1715
1454 if (coro->mainstack && coro->mainstack != main_mainstack) 1716 if (coro->next) coro->next->prev = coro->prev;
1455 { 1717 if (coro->prev) coro->prev->next = coro->next;
1456 struct coro temp; 1718 if (coro == coro_first) coro_first = coro->next;
1457 1719
1458 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1720 if (coro->mainstack
1459 1721 && coro->mainstack != main_mainstack
1460 save_perl (aTHX_ &temp); 1722 && coro->slot
1723 && !PL_dirty)
1461 load_perl (aTHX_ coro); 1724 destroy_perl (aTHX_ coro);
1462
1463 coro_destruct (aTHX_ coro);
1464
1465 load_perl (aTHX_ &temp);
1466
1467 coro->slot = 0;
1468 }
1469 1725
1470 cctx_destroy (coro->cctx); 1726 cctx_destroy (coro->cctx);
1471 SvREFCNT_dec (coro->startcv); 1727 SvREFCNT_dec (coro->startcv);
1472 SvREFCNT_dec (coro->args); 1728 SvREFCNT_dec (coro->args);
1729 SvREFCNT_dec (coro->swap_sv);
1473 SvREFCNT_dec (CORO_THROW); 1730 SvREFCNT_dec (CORO_THROW);
1474 1731
1475 if (coro->next) coro->next->prev = coro->prev; 1732 coro_call_on_destroy (coro);
1476 if (coro->prev) coro->prev->next = coro->next;
1477 if (coro == coro_first) coro_first = coro->next;
1478 1733
1479 return 1; 1734 /* more destruction mayhem in coro_state_free */
1480} 1735}
1481 1736
1482static int 1737static int
1483coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1738coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1484{ 1739{
1485 struct coro *coro = (struct coro *)mg->mg_ptr; 1740 struct coro *coro = (struct coro *)mg->mg_ptr;
1486 mg->mg_ptr = 0; 1741 mg->mg_ptr = 0;
1487 1742
1488 coro->hv = 0;
1489
1490 if (--coro->refcnt < 0)
1491 {
1492 coro_state_destroy (aTHX_ coro); 1743 coro_state_destroy (coro);
1744 SvREFCNT_dec (coro->on_destroy);
1745 SvREFCNT_dec (coro->status);
1746
1493 Safefree (coro); 1747 Safefree (coro);
1494 }
1495 1748
1496 return 0; 1749 return 0;
1497} 1750}
1498 1751
1499static int 1752static int
1500coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1753coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1501{ 1754{
1502 struct coro *coro = (struct coro *)mg->mg_ptr; 1755 /* called when perl clones the current process the slow way (windows process emulation) */
1503 1756 /* WE SIMply nuke the pointers in the copy, causing perl to croak */
1504 ++coro->refcnt; 1757 mg->mg_ptr = 0;
1758 mg->mg_virtual = 0;
1505 1759
1506 return 0; 1760 return 0;
1507} 1761}
1508 1762
1509static MGVTBL coro_state_vtbl = { 1763static MGVTBL coro_state_vtbl = {
… …
1532 1786
1533 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1787 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1534 TRANSFER (ta, 1); 1788 TRANSFER (ta, 1);
1535} 1789}
1536 1790
1537/*****************************************************************************/
1538/* gensub: simple closure generation utility */
1539
1540#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1541
1542/* create a closure from XS, returns a code reference */
1543/* the arg can be accessed via GENSUB_ARG from the callback */
1544/* the callback must use dXSARGS/XSRETURN */
1545static SV *
1546gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1547{
1548 CV *cv = (CV *)newSV (0);
1549
1550 sv_upgrade ((SV *)cv, SVt_PVCV);
1551
1552 CvANON_on (cv);
1553 CvISXSUB_on (cv);
1554 CvXSUB (cv) = xsub;
1555 GENSUB_ARG = arg;
1556
1557 return newRV_noinc ((SV *)cv);
1558}
1559
1560/** Coro ********************************************************************/ 1791/** Coro ********************************************************************/
1561 1792
1562INLINE void 1793INLINE void
1563coro_enq (pTHX_ struct coro *coro) 1794coro_enq (pTHX_ struct coro *coro)
1564{ 1795{
1565 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1796 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1566}
1567 1797
1568INLINE 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 *
1569coro_deq (pTHX) 1806coro_deq (pTHX)
1570{ 1807{
1571 int prio; 1808 int prio;
1572 1809
1573 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1810 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1574 if (AvFILLp (coro_ready [prio]) >= 0) 1811 {
1575 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 }
1576 1821
1577 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;
1578} 1840}
1579 1841
1580static int 1842static int
1581api_ready (pTHX_ SV *coro_sv) 1843api_ready (pTHX_ SV *coro_sv)
1582{ 1844{
1583 struct coro *coro;
1584 SV *sv_hook;
1585 void (*xs_hook)(void);
1586
1587 if (SvROK (coro_sv))
1588 coro_sv = SvRV (coro_sv);
1589
1590 coro = SvSTATE (coro_sv); 1845 struct coro *coro = SvSTATE (coro_sv);
1591 1846
1592 if (coro->flags & CF_READY) 1847 if (coro->flags & CF_READY)
1593 return 0; 1848 return 0;
1594 1849
1595 coro->flags |= CF_READY; 1850 coro->flags |= CF_READY;
1596 1851
1597 sv_hook = coro_nready ? 0 : coro_readyhook;
1598 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1599
1600 coro_enq (aTHX_ coro); 1852 coro_enq (aTHX_ coro);
1601 ++coro_nready;
1602 1853
1603 if (sv_hook) 1854 if (!coro_nready++)
1604 { 1855 if (coroapi.readyhook)
1605 dSP; 1856 coroapi.readyhook ();
1606
1607 ENTER;
1608 SAVETMPS;
1609
1610 PUSHMARK (SP);
1611 PUTBACK;
1612 call_sv (sv_hook, G_VOID | G_DISCARD);
1613
1614 FREETMPS;
1615 LEAVE;
1616 }
1617
1618 if (xs_hook)
1619 xs_hook ();
1620 1857
1621 return 1; 1858 return 1;
1622} 1859}
1623 1860
1624static int 1861static int
… …
1647static void 1884static void
1648prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1885prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1649{ 1886{
1650 for (;;) 1887 for (;;)
1651 { 1888 {
1652 SV *next_sv = coro_deq (aTHX); 1889 struct coro *next = coro_deq (aTHX);
1653 1890
1654 if (expect_true (next_sv)) 1891 if (expect_true (next))
1655 { 1892 {
1656 struct coro *next = SvSTATE_hv (next_sv);
1657
1658 /* cannot transfer to destroyed coros, skip and look for next */ 1893 /* cannot transfer to destroyed coros, skip and look for next */
1659 if (expect_false (next->flags & CF_DESTROYED)) 1894 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1660 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 */
1661 else 1896 else
1662 { 1897 {
1663 next->flags &= ~CF_READY; 1898 next->flags &= ~CF_READY;
1664 --coro_nready; 1899 --coro_nready;
1665 1900
… …
1668 } 1903 }
1669 } 1904 }
1670 else 1905 else
1671 { 1906 {
1672 /* 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*/
1673 dSP; 1921 dSP;
1674 1922
1675 ENTER; 1923 ENTER;
1676 SAVETMPS; 1924 SAVETMPS;
1677 1925
1678 PUSHMARK (SP); 1926 PUSHMARK (SP);
1679 PUTBACK; 1927 PUTBACK;
1680 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1928 call_sv (sv_idle, G_VOID | G_DISCARD);
1681 1929
1682 FREETMPS; 1930 FREETMPS;
1683 LEAVE; 1931 LEAVE;
1932 }
1684 } 1933 }
1685 } 1934 }
1686} 1935}
1687 1936
1688INLINE void 1937INLINE void
… …
1759static void 2008static void
1760api_trace (pTHX_ SV *coro_sv, int flags) 2009api_trace (pTHX_ SV *coro_sv, int flags)
1761{ 2010{
1762 struct coro *coro = SvSTATE (coro_sv); 2011 struct coro *coro = SvSTATE (coro_sv);
1763 2012
2013 if (coro->flags & CF_RUNNING)
2014 croak ("cannot enable tracing on a running coroutine, caught");
2015
1764 if (flags & CC_TRACE) 2016 if (flags & CC_TRACE)
1765 { 2017 {
1766 if (!coro->cctx) 2018 if (!coro->cctx)
1767 coro->cctx = cctx_new_run (); 2019 coro->cctx = cctx_new_run ();
1768 else if (!(coro->cctx->flags & CC_TRACE)) 2020 else if (!(coro->cctx->flags & CC_TRACE))
1769 croak ("cannot enable tracing on coroutine with custom stack,"); 2021 croak ("cannot enable tracing on coroutine with custom stack, caught");
1770 2022
1771 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 2023 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1772 } 2024 }
1773 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 2025 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1774 { 2026 {
… …
1780 coro->slot->runops = RUNOPS_DEFAULT; 2032 coro->slot->runops = RUNOPS_DEFAULT;
1781 } 2033 }
1782} 2034}
1783 2035
1784static void 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
1785coro_call_on_destroy (pTHX_ struct coro *coro) 2113coro_call_on_destroy (pTHX_ struct coro *coro)
1786{ 2114{
1787 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2115 AV *od = coro->on_destroy;
1788 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1789 2116
1790 if (on_destroyp) 2117 if (!od)
1791 { 2118 return;
1792 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1793 2119
1794 while (AvFILLp (on_destroy) >= 0) 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
1795 { 2128 {
1796 dSP; /* don't disturb outer sp */ 2129 dSP; /* don't disturb outer sp */
1797 SV *cb = av_pop (on_destroy);
1798
1799 PUSHMARK (SP); 2130 PUSHMARK (SP);
1800 2131
1801 if (statusp) 2132 if (coro->status)
1802 { 2133 {
1803 int i; 2134 PUTBACK;
1804 AV *status = (AV *)SvRV (*statusp); 2135 coro_push_av (aTHX_ coro->status, G_ARRAY);
1805 EXTEND (SP, AvFILLp (status) + 1); 2136 SPAGAIN;
1806
1807 for (i = 0; i <= AvFILLp (status); ++i)
1808 PUSHs (AvARRAY (status)[i]);
1809 } 2137 }
1810 2138
1811 PUTBACK; 2139 PUTBACK;
1812 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD); 2140 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1813 } 2141 }
1814 } 2142 }
1815} 2143}
1816 2144
1817static void 2145static void
1818slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2146coro_set_status (pTHX_ struct coro *coro, SV **arg, int items)
1819{ 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 {
1820 int i; 2161 int i;
1821 HV *hv = (HV *)SvRV (coro_current);
1822 AV *av = newAV ();
1823 2162
1824 av_extend (av, items - 1); 2163 av_extend (av, items - 1);
2164
1825 for (i = 0; i < items; ++i) 2165 for (i = 0; i < items; ++i)
1826 av_push (av, SvREFCNT_inc_NN (arg [i])); 2166 av_push (av, SvREFCNT_inc_NN (arg [i]));
2167 }
2168}
1827 2169
1828 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2170static void
1829 2171slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2172{
1830 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2173 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1831 api_ready (aTHX_ sv_manager); 2174 api_ready (aTHX_ sv_manager);
1832 2175
1833 frame->prepare = prepare_schedule; 2176 frame->prepare = prepare_schedule;
1834 frame->check = slf_check_repeat; 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;
1835} 2285}
1836 2286
1837/*****************************************************************************/ 2287/*****************************************************************************/
1838/* async pool handler */ 2288/* async pool handler */
1839 2289
… …
1879 coro->saved_deffh = 0; 2329 coro->saved_deffh = 0;
1880 2330
1881 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2331 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1882 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2332 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1883 { 2333 {
1884 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2334 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1885 coro->invoke_av = newAV (); 2335 return;
1886
1887 frame->prepare = prepare_nop;
1888 } 2336 }
1889 else 2337 else
1890 { 2338 {
1891 av_clear (GvAV (PL_defgv)); 2339 av_clear (GvAV (PL_defgv));
1892 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);
… …
1917 2365
1918static void 2366static void
1919coro_rouse_callback (pTHX_ CV *cv) 2367coro_rouse_callback (pTHX_ CV *cv)
1920{ 2368{
1921 dXSARGS; 2369 dXSARGS;
1922 SV *data = (SV *)GENSUB_ARG; 2370 SV *data = (SV *)S_GENSUB_ARG;
1923 2371
1924 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2372 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1925 { 2373 {
1926 /* first call, set args */ 2374 /* first call, set args */
2375 SV *coro = SvRV (data);
1927 AV *av = newAV (); 2376 AV *av = newAV ();
1928 SV *coro = SvRV (data);
1929 2377
1930 SvRV_set (data, (SV *)av); 2378 SvRV_set (data, (SV *)av);
1931 api_ready (aTHX_ coro);
1932 SvREFCNT_dec (coro);
1933 2379
1934 /* better take a full copy of the arguments */ 2380 /* better take a full copy of the arguments */
1935 while (items--) 2381 while (items--)
1936 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);
1937 } 2386 }
1938 2387
1939 XSRETURN_EMPTY; 2388 XSRETURN_EMPTY;
1940} 2389}
1941 2390
… …
1958 2407
1959 EXTEND (SP, AvFILLp (av) + 1); 2408 EXTEND (SP, AvFILLp (av) + 1);
1960 for (i = 0; i <= AvFILLp (av); ++i) 2409 for (i = 0; i <= AvFILLp (av); ++i)
1961 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2410 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1962 2411
1963 /* 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 */
1964 AvFILLp (av) = -1; 2413 AvFILLp (av) = -1;
1965 av_undef (av); 2414 av_undef (av);
1966 2415
1967 PUTBACK; 2416 PUTBACK;
1968 } 2417 }
… …
1992 || SvTYPE (SvRV (cb)) != SVt_PVCV 2441 || SvTYPE (SvRV (cb)) != SVt_PVCV
1993 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2442 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1994 croak ("Coro::rouse_wait called with illegal callback argument,"); 2443 croak ("Coro::rouse_wait called with illegal callback argument,");
1995 2444
1996 { 2445 {
1997 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2446 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1998 SV *data = (SV *)GENSUB_ARG; 2447 SV *data = (SV *)S_GENSUB_ARG;
1999 2448
2000 frame->data = (void *)data; 2449 frame->data = (void *)data;
2001 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2450 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2002 frame->check = slf_check_rouse_wait; 2451 frame->check = slf_check_rouse_wait;
2003 } 2452 }
… …
2007coro_new_rouse_cb (pTHX) 2456coro_new_rouse_cb (pTHX)
2008{ 2457{
2009 HV *hv = (HV *)SvRV (coro_current); 2458 HV *hv = (HV *)SvRV (coro_current);
2010 struct coro *coro = SvSTATE_hv (hv); 2459 struct coro *coro = SvSTATE_hv (hv);
2011 SV *data = newRV_inc ((SV *)hv); 2460 SV *data = newRV_inc ((SV *)hv);
2012 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2461 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2013 2462
2014 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);
2015 SvREFCNT_dec (data); /* magicext increases the refcount */ 2464 SvREFCNT_dec (data); /* magicext increases the refcount */
2016 2465
2017 SvREFCNT_dec (coro->rouse_cb); 2466 SvREFCNT_dec (coro->rouse_cb);
… …
2114static void 2563static void
2115slf_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)
2116{ 2565{
2117 frame->prepare = prepare_cede_notself; 2566 frame->prepare = prepare_cede_notself;
2118 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;
2119} 2585}
2120 2586
2121/* 2587/*
2122 * these not obviously related functions are all rolled into one 2588 * these not obviously related functions are all rolled into one
2123 * 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
… …
2192 croak (0); 2658 croak (0);
2193 } 2659 }
2194 2660
2195 /* return value handling - mostly like entersub */ 2661 /* return value handling - mostly like entersub */
2196 /* make sure we put something on the stack in scalar context */ 2662 /* make sure we put something on the stack in scalar context */
2197 if (GIMME_V == G_SCALAR) 2663 if (GIMME_V == G_SCALAR
2664 && expect_false (PL_stack_sp != PL_stack_base + checkmark + 1))
2198 { 2665 {
2199 dSP; 2666 dSP;
2200 SV **bot = PL_stack_base + checkmark; 2667 SV **bot = PL_stack_base + checkmark;
2201 2668
2202 if (sp == bot) /* too few, push undef */ 2669 if (sp == bot) /* too few, push undef */
2203 bot [1] = &PL_sv_undef; 2670 bot [1] = &PL_sv_undef;
2204 else if (sp != bot + 1) /* too many, take last one */ 2671 else /* too many, take last one */
2205 bot [1] = *sp; 2672 bot [1] = *sp;
2206 2673
2207 SP = bot + 1; 2674 SP = bot + 1;
2208 2675
2209 PUTBACK; 2676 PUTBACK;
… …
2242 if (PL_op->op_flags & OPf_STACKED) 2709 if (PL_op->op_flags & OPf_STACKED)
2243 { 2710 {
2244 if (items > slf_arga) 2711 if (items > slf_arga)
2245 { 2712 {
2246 slf_arga = items; 2713 slf_arga = items;
2247 free (slf_argv); 2714 Safefree (slf_argv);
2248 slf_argv = malloc (slf_arga * sizeof (SV *)); 2715 New (0, slf_argv, slf_arga, SV *);
2249 } 2716 }
2250 2717
2251 slf_argc = items; 2718 slf_argc = items;
2252 2719
2253 for (i = 0; i < items; ++i) 2720 for (i = 0; i < items; ++i)
… …
2258 2725
2259 PL_op->op_ppaddr = pp_slf; 2726 PL_op->op_ppaddr = pp_slf;
2260 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2727 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2261 2728
2262 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));
2263} 2777}
2264 2778
2265/*****************************************************************************/ 2779/*****************************************************************************/
2266/* PerlIO::cede */ 2780/* PerlIO::cede */
2267 2781
… …
2341/* Coro::Semaphore & Coro::Signal */ 2855/* Coro::Semaphore & Coro::Signal */
2342 2856
2343static SV * 2857static SV *
2344coro_waitarray_new (pTHX_ int count) 2858coro_waitarray_new (pTHX_ int count)
2345{ 2859{
2346 /* 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 */
2347 AV *av = newAV (); 2861 AV *av = newAV ();
2348 SV **ary; 2862 SV **ary;
2349 2863
2350 /* unfortunately, building manually saves memory */ 2864 /* unfortunately, building manually saves memory */
2351 Newx (ary, 2, SV *); 2865 Newx (ary, 2, SV *);
2352 AvALLOC (av) = ary; 2866 AvALLOC (av) = ary;
2867#if PERL_VERSION_ATLEAST (5,10,0)
2353 /*AvARRAY (av) = ary;*/ 2868 AvARRAY (av) = ary;
2869#else
2354 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
2355 AvMAX (av) = 1; 2874 AvMAX (av) = 1;
2356 AvFILLp (av) = 0; 2875 AvFILLp (av) = 0;
2357 ary [0] = newSViv (count); 2876 ary [0] = newSViv (count);
2358 2877
2359 return newRV_noinc ((SV *)av); 2878 return newRV_noinc ((SV *)av);
… …
2397 SvREFCNT_dec (cb); 2916 SvREFCNT_dec (cb);
2398 } 2917 }
2399} 2918}
2400 2919
2401static void 2920static void
2402coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2921coro_semaphore_destroy (pTHX_ struct CoroSLF *frame)
2403{ 2922{
2404 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2923 /* call $sem->adjust (0) to possibly wake up some other waiters */
2405 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2924 coro_semaphore_adjust (aTHX_ (AV *)frame->data, 0);
2406} 2925}
2407 2926
2408static int 2927static int
2409slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire) 2928slf_check_semaphore_down_or_wait (pTHX_ struct CoroSLF *frame, int acquire)
2410{ 2929{
2411 AV *av = (AV *)frame->data; 2930 AV *av = (AV *)frame->data;
2412 SV *count_sv = AvARRAY (av)[0]; 2931 SV *count_sv = AvARRAY (av)[0];
2932 SV *coro_hv = SvRV (coro_current);
2413 2933
2414 /* 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 */
2415 if (CORO_THROW) 2935 if (CORO_THROW)
2416 return 0; 2936 return 0;
2417 else if (SvIVX (count_sv) > 0) 2937 else if (SvIVX (count_sv) > 0)
2418 { 2938 {
2419 SvSTATE_current->on_destroy = 0; 2939 frame->destroy = 0;
2420 2940
2421 if (acquire) 2941 if (acquire)
2422 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2942 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2423 else 2943 else
2424 coro_semaphore_adjust (aTHX_ av, 0); 2944 coro_semaphore_adjust (aTHX_ av, 0);
… …
2429 { 2949 {
2430 int i; 2950 int i;
2431 /* 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 */
2432 /* 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 */
2433 /* this avoids some degenerate memory usage cases */ 2953 /* this avoids some degenerate memory usage cases */
2434 2954 for (i = AvFILLp (av); i > 0; --i) // i > 0 is not an off-by-one bug
2435 for (i = 1; i <= AvFILLp (av); ++i)
2436 if (AvARRAY (av)[i] == SvRV (coro_current)) 2955 if (AvARRAY (av)[i] == coro_hv)
2437 return 1; 2956 return 1;
2438 2957
2439 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2958 av_push (av, SvREFCNT_inc (coro_hv));
2440 return 1; 2959 return 1;
2441 } 2960 }
2442} 2961}
2443 2962
2444static int 2963static int
… …
2467 { 2986 {
2468 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2987 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2469 2988
2470 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2989 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2471 frame->prepare = prepare_schedule; 2990 frame->prepare = prepare_schedule;
2472
2473 /* to avoid race conditions when a woken-up coro gets terminated */ 2991 /* to avoid race conditions when a woken-up coro gets terminated */
2474 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2992 /* we arrange for a temporary on_destroy that calls adjust (0) */
2475 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2993 frame->destroy = coro_semaphore_destroy;
2476 } 2994 }
2477} 2995}
2478 2996
2479static void 2997static void
2480slf_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)
… …
2488{ 3006{
2489 if (items >= 2) 3007 if (items >= 2)
2490 { 3008 {
2491 /* callback form */ 3009 /* callback form */
2492 AV *av = (AV *)SvRV (arg [0]); 3010 AV *av = (AV *)SvRV (arg [0]);
2493 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 3011 SV *cb_cv = s_get_cv_croak (arg [1]);
2494 3012
2495 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 3013 av_push (av, SvREFCNT_inc_NN (cb_cv));
2496 3014
2497 if (SvIVX (AvARRAY (av)[0]) > 0) 3015 if (SvIVX (AvARRAY (av)[0]) > 0)
2498 coro_semaphore_adjust (aTHX_ av, 0); 3016 coro_semaphore_adjust (aTHX_ av, 0);
2499 3017
2500 frame->prepare = prepare_nop; 3018 frame->prepare = prepare_nop;
… …
2524 AvARRAY (av)[0] = AvARRAY (av)[1]; 3042 AvARRAY (av)[0] = AvARRAY (av)[1];
2525 AvARRAY (av)[1] = cb; 3043 AvARRAY (av)[1] = cb;
2526 3044
2527 cb = av_shift (av); 3045 cb = av_shift (av);
2528 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 {
2529 api_ready (aTHX_ cb); 3057 api_ready (aTHX_ cb);
2530 sv_setiv (cb, 0); /* signal waiter */ 3058 sv_setiv (cb, 0); /* signal waiter */
3059 }
3060
2531 SvREFCNT_dec (cb); 3061 SvREFCNT_dec (cb);
2532 3062
2533 --count; 3063 --count;
2534 } 3064 }
2535} 3065}
… …
2544static void 3074static void
2545slf_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)
2546{ 3076{
2547 AV *av = (AV *)SvRV (arg [0]); 3077 AV *av = (AV *)SvRV (arg [0]);
2548 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
2549 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]))
2550 { 3091 {
2551 SvIVX (AvARRAY (av)[0]) = 0; 3092 SvIVX (AvARRAY (av)[0]) = 0;
2552 frame->prepare = prepare_nop; 3093 frame->prepare = prepare_nop;
2553 frame->check = slf_check_nop; 3094 frame->check = slf_check_nop;
2554 } 3095 }
2555 else 3096 else
2556 { 3097 {
2557 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 3098 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2558 3099
2559 av_push (av, waiter); 3100 av_push (av, waiter);
2560 3101
2561 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 */
2562 frame->prepare = prepare_schedule; 3103 frame->prepare = prepare_schedule;
… …
2580 3121
2581static void 3122static void
2582coro_aio_callback (pTHX_ CV *cv) 3123coro_aio_callback (pTHX_ CV *cv)
2583{ 3124{
2584 dXSARGS; 3125 dXSARGS;
2585 AV *state = (AV *)GENSUB_ARG; 3126 AV *state = (AV *)S_GENSUB_ARG;
2586 SV *coro = av_pop (state); 3127 SV *coro = av_pop (state);
2587 SV *data_sv = newSV (sizeof (struct io_state)); 3128 SV *data_sv = newSV (sizeof (struct io_state));
2588 3129
2589 av_extend (state, items - 1); 3130 av_extend (state, items - 1);
2590 3131
… …
2704 3245
2705 for (i = 0; i < items; ++i) 3246 for (i = 0; i < items; ++i)
2706 PUSHs (arg [i]); 3247 PUSHs (arg [i]);
2707 3248
2708 /* now push the callback closure */ 3249 /* now push the callback closure */
2709 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))));
2710 3251
2711 /* now call the AIO function - we assume our request is uncancelable */ 3252 /* now call the AIO function - we assume our request is uncancelable */
2712 PUTBACK; 3253 PUTBACK;
2713 call_sv ((SV *)req, G_VOID | G_DISCARD); 3254 call_sv ((SV *)req, G_VOID | G_DISCARD);
2714 } 3255 }
2715 3256
2716 /* 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 */
2717 frame->data = (void *)state; 3258 frame->data = (void *)state;
2718 frame->prepare = prepare_schedule; 3259 frame->prepare = prepare_schedule;
2719 frame->check = slf_check_aio_req; 3260 frame->check = slf_check_aio_req;
2720} 3261}
2721 3262
… …
2732/*****************************************************************************/ 3273/*****************************************************************************/
2733 3274
2734#if CORO_CLONE 3275#if CORO_CLONE
2735# include "clone.c" 3276# include "clone.c"
2736#endif 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}
2737 3336
2738MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3337MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2739 3338
2740PROTOTYPES: DISABLE 3339PROTOTYPES: DISABLE
2741 3340
… …
2746 coro_thx = PERL_GET_CONTEXT; 3345 coro_thx = PERL_GET_CONTEXT;
2747# endif 3346# endif
2748#endif 3347#endif
2749 BOOT_PAGESIZE; 3348 BOOT_PAGESIZE;
2750 3349
3350 cctx_current = cctx_new_empty ();
3351
2751 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3352 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2752 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3353 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2753 3354
2754 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;
2755 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;
… …
2792 coroapi.prepare_nop = prepare_nop; 3393 coroapi.prepare_nop = prepare_nop;
2793 coroapi.prepare_schedule = prepare_schedule; 3394 coroapi.prepare_schedule = prepare_schedule;
2794 coroapi.prepare_cede = prepare_cede; 3395 coroapi.prepare_cede = prepare_cede;
2795 coroapi.prepare_cede_notself = prepare_cede_notself; 3396 coroapi.prepare_cede_notself = prepare_cede_notself;
2796 3397
2797 { 3398 time_init (aTHX);
2798 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2799 3399
2800 if (!svp) croak ("Time::HiRes is required");
2801 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2802
2803 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2804 }
2805
2806 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3400 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2807} 3401}
2808 3402
2809SV * 3403SV *
2810new (char *klass, ...) 3404new (SV *klass, ...)
2811 ALIAS: 3405 ALIAS:
2812 Coro::new = 1 3406 Coro::new = 1
2813 CODE: 3407 CODE:
2814{ 3408 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2815 struct coro *coro; 3409 OUTPUT:
2816 MAGIC *mg;
2817 HV *hv;
2818 CV *cb;
2819 int i;
2820
2821 if (items > 1)
2822 {
2823 cb = coro_sv_2cv (aTHX_ ST (1));
2824
2825 if (!ix)
2826 {
2827 if (CvISXSUB (cb))
2828 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
2829
2830 if (!CvROOT (cb))
2831 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
2832 }
2833 }
2834
2835 Newz (0, coro, 1, struct coro);
2836 coro->args = newAV ();
2837 coro->flags = CF_NEW;
2838
2839 if (coro_first) coro_first->prev = coro;
2840 coro->next = coro_first;
2841 coro_first = coro;
2842
2843 coro->hv = hv = newHV ();
2844 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2845 mg->mg_flags |= MGf_DUP;
2846 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2847
2848 if (items > 1)
2849 {
2850 av_extend (coro->args, items - 1 + ix - 1);
2851
2852 if (ix)
2853 {
2854 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
2855 cb = cv_coro_run;
2856 }
2857
2858 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
2859
2860 for (i = 2; i < items; i++)
2861 av_push (coro->args, newSVsv (ST (i)));
2862 }
2863}
2864 OUTPUT:
2865 RETVAL 3410 RETVAL
2866 3411
2867void 3412void
2868transfer (...) 3413transfer (...)
2869 PROTOTYPE: $$ 3414 PROTOTYPE: $$
2870 CODE: 3415 CODE:
2871 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3416 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2872 3417
2873bool
2874_destroy (SV *coro_sv)
2875 CODE:
2876 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2877 OUTPUT:
2878 RETVAL
2879
2880void 3418void
2881_exit (int code) 3419_exit (int code)
2882 PROTOTYPE: $ 3420 PROTOTYPE: $
2883 CODE: 3421 CODE:
2884 _exit (code); 3422 _exit (code);
2885 3423
2886#if CORO_CLONE
2887
2888SV * 3424SV *
2889clone (Coro::State coro) 3425clone (Coro::State coro)
2890 CODE: 3426 CODE:
2891{ 3427{
3428#if CORO_CLONE
2892 struct coro *ncoro = coro_clone (coro); 3429 struct coro *ncoro = coro_clone (aTHX_ coro);
2893 MAGIC *mg; 3430 MAGIC *mg;
2894 /* TODO: too much duplication */ 3431 /* TODO: too much duplication */
2895 ncoro->hv = newHV (); 3432 ncoro->hv = newHV ();
2896 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3433 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2897 mg->mg_flags |= MGf_DUP; 3434 mg->mg_flags |= MGf_DUP;
2898 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv)); 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
2899} 3439}
2900 OUTPUT: 3440 OUTPUT:
2901 RETVAL 3441 RETVAL
2902
2903#endif
2904 3442
2905int 3443int
2906cctx_stacksize (int new_stacksize = 0) 3444cctx_stacksize (int new_stacksize = 0)
2907 PROTOTYPE: ;$ 3445 PROTOTYPE: ;$
2908 CODE: 3446 CODE:
… …
2958 eval = 1 3496 eval = 1
2959 CODE: 3497 CODE:
2960{ 3498{
2961 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3499 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2962 { 3500 {
2963 struct coro temp; 3501 struct coro *current = SvSTATE_current;
3502 struct CoroSLF slf_save;
2964 3503
2965 if (!(coro->flags & CF_RUNNING)) 3504 if (current != coro)
2966 { 3505 {
2967 PUTBACK; 3506 PUTBACK;
2968 save_perl (aTHX_ &temp); 3507 save_perl (aTHX_ current);
2969 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;
2970 } 3519 }
2971 3520
2972 {
2973 dSP;
2974 ENTER;
2975 SAVETMPS;
2976 PUTBACK;
2977 PUSHSTACK; 3521 PUSHSTACK;
3522
2978 PUSHMARK (SP); 3523 PUSHMARK (SP);
3524 PUTBACK;
2979 3525
2980 if (ix) 3526 if (ix)
2981 eval_sv (coderef, 0); 3527 eval_sv (coderef, 0);
2982 else 3528 else
2983 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3529 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2984 3530
2985 POPSTACK; 3531 POPSTACK;
2986 SPAGAIN; 3532 SPAGAIN;
2987 FREETMPS;
2988 LEAVE;
2989 PUTBACK;
2990 }
2991 3533
2992 if (!(coro->flags & CF_RUNNING)) 3534 if (current != coro)
2993 { 3535 {
3536 PUTBACK;
3537 slf_frame = slf_save;
2994 save_perl (aTHX_ coro); 3538 save_perl (aTHX_ coro);
2995 load_perl (aTHX_ &temp); 3539 load_perl (aTHX_ current);
2996 SPAGAIN; 3540 SPAGAIN;
2997 } 3541 }
2998 } 3542 }
2999} 3543}
3000 3544
… …
3004 ALIAS: 3548 ALIAS:
3005 is_ready = CF_READY 3549 is_ready = CF_READY
3006 is_running = CF_RUNNING 3550 is_running = CF_RUNNING
3007 is_new = CF_NEW 3551 is_new = CF_NEW
3008 is_destroyed = CF_DESTROYED 3552 is_destroyed = CF_DESTROYED
3553 is_suspended = CF_SUSPENDED
3009 CODE: 3554 CODE:
3010 RETVAL = boolSV (coro->flags & ix); 3555 RETVAL = boolSV (coro->flags & ix);
3011 OUTPUT: 3556 OUTPUT:
3012 RETVAL 3557 RETVAL
3013 3558
3014void 3559void
3015throw (Coro::State self, SV *throw = &PL_sv_undef) 3560throw (Coro::State self, SV *exception = &PL_sv_undef)
3016 PROTOTYPE: $;$ 3561 PROTOTYPE: $;$
3017 CODE: 3562 CODE:
3018{ 3563{
3019 struct coro *current = SvSTATE_current; 3564 struct coro *current = SvSTATE_current;
3020 SV **throwp = self == current ? &CORO_THROW : &self->except; 3565 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3021 SvREFCNT_dec (*throwp); 3566 SvREFCNT_dec (*exceptionp);
3022 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3567 SvGETMAGIC (exception);
3568 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3023} 3569}
3024 3570
3025void 3571void
3026api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3572api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3027 PROTOTYPE: $;$ 3573 PROTOTYPE: $;$
… …
3029 3575
3030SV * 3576SV *
3031has_cctx (Coro::State coro) 3577has_cctx (Coro::State coro)
3032 PROTOTYPE: $ 3578 PROTOTYPE: $
3033 CODE: 3579 CODE:
3034 RETVAL = boolSV (!!coro->cctx); 3580 /* maybe manage the running flag differently */
3581 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
3035 OUTPUT: 3582 OUTPUT:
3036 RETVAL 3583 RETVAL
3037 3584
3038int 3585int
3039is_traced (Coro::State coro) 3586is_traced (Coro::State coro)
… …
3059 3606
3060void 3607void
3061force_cctx () 3608force_cctx ()
3062 PROTOTYPE: 3609 PROTOTYPE:
3063 CODE: 3610 CODE:
3064 SvSTATE_current->cctx->idle_sp = 0; 3611 cctx_current->idle_sp = 0;
3065 3612
3066void 3613void
3067swap_defsv (Coro::State self) 3614swap_defsv (Coro::State self)
3068 PROTOTYPE: $ 3615 PROTOTYPE: $
3069 ALIAS: 3616 ALIAS:
… …
3077 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3624 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3078 3625
3079 SV *tmp = *src; *src = *dst; *dst = tmp; 3626 SV *tmp = *src; *src = *dst; *dst = tmp;
3080 } 3627 }
3081 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
3082 3690
3083MODULE = Coro::State PACKAGE = Coro 3691MODULE = Coro::State PACKAGE = Coro
3084 3692
3085BOOT: 3693BOOT:
3086{ 3694{
3087 int i;
3088
3089 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3695 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3090 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3696 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3091 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3697 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3092 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3093 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);
3094 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3699 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3095 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3700 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3096 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3701 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3702 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3097 3703
3098 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);
3099 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3705 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3100 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);
3101 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 */
3102 3708
3103 coro_stash = gv_stashpv ("Coro", TRUE); 3709 coro_stash = gv_stashpv ("Coro", TRUE);
3104 3710
3105 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3711 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3106 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3712 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3107 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3713 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3108 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3714 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3109 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3715 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3110 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3716 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
3111
3112 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3113 coro_ready[i] = newAV ();
3114 3717
3115 { 3718 {
3116 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3719 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3117 3720
3118 coroapi.schedule = api_schedule; 3721 coroapi.schedule = api_schedule;
… …
3128 sv_setiv (sv, (IV)&coroapi); 3731 sv_setiv (sv, (IV)&coroapi);
3129 SvREADONLY_on (sv); 3732 SvREADONLY_on (sv);
3130 } 3733 }
3131} 3734}
3132 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
3133void 3761void
3134terminate (...) 3762terminate (...)
3135 CODE: 3763 CODE:
3136 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3764 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3137 3765
3138void 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
3775void
3139schedule (...) 3776schedule (...)
3140 CODE: 3777 CODE:
3141 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3778 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3142 3779
3143void 3780void
… …
3157 3794
3158void 3795void
3159cede_notself (...) 3796cede_notself (...)
3160 CODE: 3797 CODE:
3161 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3798 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3162
3163void
3164_cancel (Coro::State self)
3165 CODE:
3166 coro_state_destroy (aTHX_ self);
3167 coro_call_on_destroy (aTHX_ self);
3168 3799
3169void 3800void
3170_set_current (SV *current) 3801_set_current (SV *current)
3171 PROTOTYPE: $ 3802 PROTOTYPE: $
3172 CODE: 3803 CODE:
… …
3176void 3807void
3177_set_readyhook (SV *hook) 3808_set_readyhook (SV *hook)
3178 PROTOTYPE: $ 3809 PROTOTYPE: $
3179 CODE: 3810 CODE:
3180 SvREFCNT_dec (coro_readyhook); 3811 SvREFCNT_dec (coro_readyhook);
3812 SvGETMAGIC (hook);
3813 if (SvOK (hook))
3814 {
3181 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 }
3182 3823
3183int 3824int
3184prio (Coro::State coro, int newprio = 0) 3825prio (Coro::State coro, int newprio = 0)
3185 PROTOTYPE: $;$ 3826 PROTOTYPE: $;$
3186 ALIAS: 3827 ALIAS:
… …
3192 if (items > 1) 3833 if (items > 1)
3193 { 3834 {
3194 if (ix) 3835 if (ix)
3195 newprio = coro->prio - newprio; 3836 newprio = coro->prio - newprio;
3196 3837
3197 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3838 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3198 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3839 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3199 3840
3200 coro->prio = newprio; 3841 coro->prio = newprio;
3201 } 3842 }
3202} 3843}
3203 OUTPUT: 3844 OUTPUT:
… …
3218 RETVAL = coro_nready; 3859 RETVAL = coro_nready;
3219 OUTPUT: 3860 OUTPUT:
3220 RETVAL 3861 RETVAL
3221 3862
3222void 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
3223_pool_handler (...) 3876_pool_handler (...)
3224 CODE: 3877 CODE:
3225 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3878 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3226 3879
3227void 3880void
… …
3238 for (i = 1; i < items; ++i) 3891 for (i = 1; i < items; ++i)
3239 av_push (av, SvREFCNT_inc_NN (ST (i))); 3892 av_push (av, SvREFCNT_inc_NN (ST (i)));
3240 3893
3241 if ((SV *)hv == &PL_sv_undef) 3894 if ((SV *)hv == &PL_sv_undef)
3242 { 3895 {
3243 PUSHMARK (SP); 3896 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3244 EXTEND (SP, 2);
3245 PUSHs (sv_Coro);
3246 PUSHs ((SV *)cv_pool_handler);
3247 PUTBACK;
3248 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3249 SPAGAIN;
3250
3251 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3897 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3898 SvREFCNT_dec (sv);
3252 } 3899 }
3253 3900
3254 { 3901 {
3255 struct coro *coro = SvSTATE_hv (hv); 3902 struct coro *coro = SvSTATE_hv (hv);
3256 3903
… …
3280rouse_wait (...) 3927rouse_wait (...)
3281 PROTOTYPE: ;$ 3928 PROTOTYPE: ;$
3282 PPCODE: 3929 PPCODE:
3283 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3930 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3284 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
3285 3957
3286MODULE = Coro::State PACKAGE = PerlIO::cede 3958MODULE = Coro::State PACKAGE = PerlIO::cede
3287 3959
3288BOOT: 3960BOOT:
3289 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3961 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3292MODULE = Coro::State PACKAGE = Coro::Semaphore 3964MODULE = Coro::State PACKAGE = Coro::Semaphore
3293 3965
3294SV * 3966SV *
3295new (SV *klass, SV *count = 0) 3967new (SV *klass, SV *count = 0)
3296 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
3297 RETVAL = sv_bless ( 3980 RETVAL = sv_bless (
3298 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3981 coro_waitarray_new (aTHX_ semcnt),
3299 GvSTASH (CvGV (cv)) 3982 GvSTASH (CvGV (cv))
3300 ); 3983 );
3984}
3301 OUTPUT: 3985 OUTPUT:
3302 RETVAL 3986 RETVAL
3303 3987
3304# helper for Coro::Channel 3988# helper for Coro::Channel and others
3305SV * 3989SV *
3306_alloc (int count) 3990_alloc (int count)
3307 CODE: 3991 CODE:
3308 RETVAL = coro_waitarray_new (aTHX_ count); 3992 RETVAL = coro_waitarray_new (aTHX_ count);
3309 OUTPUT: 3993 OUTPUT:
… …
3367 for (i = 1; i <= wcount; ++i) 4051 for (i = 1; i <= wcount; ++i)
3368 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 4052 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3369 } 4053 }
3370} 4054}
3371 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
3372MODULE = Coro::State PACKAGE = Coro::Signal 4072MODULE = Coro::State PACKAGE = Coro::Signal
3373 4073
3374SV * 4074SV *
3375new (SV *klass) 4075new (SV *klass)
3376 CODE: 4076 CODE:
… …
3447 4147
3448void 4148void
3449_register (char *target, char *proto, SV *req) 4149_register (char *target, char *proto, SV *req)
3450 CODE: 4150 CODE:
3451{ 4151{
3452 CV *req_cv = coro_sv_2cv (aTHX_ req); 4152 SV *req_cv = s_get_cv_croak (req);
3453 /* newXSproto doesn't return the CV on 5.8 */ 4153 /* newXSproto doesn't return the CV on 5.8 */
3454 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4154 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3455 sv_setpv ((SV *)slf_cv, proto); 4155 sv_setpv ((SV *)slf_cv, proto);
3456 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);
3457} 4157}
3458 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