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

Diff Legend

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