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.397 by root, Fri May 6 21:15:17 2011 UTC

1#define CORO_CLONE 1 //D 1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
2 5
3#include "libcoro/coro.c" 6#include "libcoro/coro.c"
4 7
5#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
6#define PERL_EXT 9#define PERL_EXT
… …
8#include "EXTERN.h" 11#include "EXTERN.h"
9#include "perl.h" 12#include "perl.h"
10#include "XSUB.h" 13#include "XSUB.h"
11#include "perliol.h" 14#include "perliol.h"
12 15
13#include "patchlevel.h" 16#include "schmorp.h"
14 17
15#include <stdio.h> 18#include <stdio.h>
16#include <errno.h> 19#include <errno.h>
17#include <assert.h> 20#include <assert.h>
18 21
19#ifdef WIN32 22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
25
26#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY
20# undef setjmp 28# undef setjmp
21# undef longjmp 29# undef longjmp
22# undef _exit 30# undef _exit
23# define setjmp _setjmp /* deep magic */ 31# define setjmp _setjmp /* deep magic */
24#else 32#else
… …
53#endif 61#endif
54 62
55/* the maximum number of idle cctx that will be pooled */ 63/* the maximum number of idle cctx that will be pooled */
56static int cctx_max_idle = 4; 64static int cctx_max_idle = 4;
57 65
58#define PERL_VERSION_ATLEAST(a,b,c) \
59 (PERL_REVISION > (a) \
60 || (PERL_REVISION == (a) \
61 && (PERL_VERSION > (b) \
62 || (PERL_VERSION == (b) && PERL_SUBVERSION >= (c)))))
63
64#if !PERL_VERSION_ATLEAST (5,6,0)
65# ifndef PL_ppaddr
66# define PL_ppaddr ppaddr
67# endif
68# ifndef call_sv
69# define call_sv perl_call_sv
70# endif
71# ifndef get_sv
72# define get_sv perl_get_sv
73# endif
74# ifndef get_cv
75# define get_cv perl_get_cv
76# endif
77# ifndef IS_PADGV
78# define IS_PADGV(v) 0
79# endif
80# ifndef IS_PADCONST
81# define IS_PADCONST(v) 0
82# endif
83#endif
84
85/* 5.11 */
86#ifndef CxHASARGS
87# define CxHASARGS(cx) (cx)->blk_sub.hasargs
88#endif
89
90/* 5.10.0 */
91#ifndef SvREFCNT_inc_NN
92# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
93#endif
94
95/* 5.8.8 */
96#ifndef GV_NOTQUAL
97# define GV_NOTQUAL 0
98#endif
99#ifndef newSV
100# define newSV(l) NEWSV(0,l)
101#endif
102#ifndef CvISXSUB_on
103# define CvISXSUB_on(cv) (void)cv
104#endif
105#ifndef CvISXSUB
106# define CvISXSUB(cv) (CvXSUB (cv) ? TRUE : FALSE)
107#endif
108#ifndef Newx
109# define Newx(ptr,nitems,type) New (0,ptr,nitems,type)
110#endif
111
112/* 5.8.7 */
113#ifndef SvRV_set
114# define SvRV_set(s,v) SvRV(s) = (v)
115#endif
116
117#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 66#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
118# undef CORO_STACKGUARD 67# undef CORO_STACKGUARD
119#endif 68#endif
120 69
121#ifndef CORO_STACKGUARD 70#ifndef CORO_STACKGUARD
… …
135#else 84#else
136# define dSTACKLEVEL volatile void *stacklevel 85# define dSTACKLEVEL volatile void *stacklevel
137# define STACKLEVEL ((void *)&stacklevel) 86# define STACKLEVEL ((void *)&stacklevel)
138#endif 87#endif
139 88
140#define IN_DESTRUCT (PL_main_cv == Nullcv) 89#define IN_DESTRUCT PL_dirty
141 90
142#if __GNUC__ >= 3 91#if __GNUC__ >= 3
143# define attribute(x) __attribute__(x) 92# define attribute(x) __attribute__(x)
144# define expect(expr,value) __builtin_expect ((expr),(value)) 93# define expect(expr,value) __builtin_expect ((expr), (value))
145# define INLINE static inline 94# define INLINE static inline
146#else 95#else
147# define attribute(x) 96# define attribute(x)
148# define expect(expr,value) (expr) 97# define expect(expr,value) (expr)
149# define INLINE static 98# define INLINE static
… …
161# if CORO_PTHREAD 110# if CORO_PTHREAD
162static void *coro_thx; 111static void *coro_thx;
163# endif 112# endif
164#endif 113#endif
165 114
115#ifdef __linux
116# include <time.h> /* for timespec */
117# include <syscall.h> /* for SYS_* */
118# ifdef SYS_clock_gettime
119# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
120# define CORO_CLOCK_MONOTONIC 1
121# define CORO_CLOCK_THREAD_CPUTIME_ID 3
122# endif
123#endif
124
166static double (*nvtime)(); /* so why doesn't it take void? */ 125static double (*nvtime)(); /* so why doesn't it take void? */
126static void (*u2time)(pTHX_ UV ret[2]);
167 127
168/* we hijack an hopefully unused CV flag for our purposes */ 128/* we hijack an hopefully unused CV flag for our purposes */
169#define CVf_SLF 0x4000 129#define CVf_SLF 0x4000
170static OP *pp_slf (pTHX); 130static OP *pp_slf (pTHX);
131static void slf_destroy (pTHX_ struct coro *coro);
171 132
172static U32 cctx_gen; 133static U32 cctx_gen;
173static size_t cctx_stacksize = CORO_STACKSIZE; 134static size_t cctx_stacksize = CORO_STACKSIZE;
174static struct CoroAPI coroapi; 135static struct CoroAPI coroapi;
175static AV *main_mainstack; /* used to differentiate between $main and others */ 136static AV *main_mainstack; /* used to differentiate between $main and others */
… …
177static HV *coro_state_stash, *coro_stash; 138static HV *coro_state_stash, *coro_stash;
178static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 139static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
179 140
180static AV *av_destroy; /* destruction queue */ 141static AV *av_destroy; /* destruction queue */
181static SV *sv_manager; /* the manager coro */ 142static SV *sv_manager; /* the manager coro */
143static SV *sv_idle; /* $Coro::idle */
182 144
183static GV *irsgv; /* $/ */ 145static GV *irsgv; /* $/ */
184static GV *stdoutgv; /* *STDOUT */ 146static GV *stdoutgv; /* *STDOUT */
185static SV *rv_diehook; 147static SV *rv_diehook;
186static SV *rv_warnhook; 148static SV *rv_warnhook;
… …
191static SV *sv_pool_size; 153static SV *sv_pool_size;
192static SV *sv_async_pool_idle; /* description string */ 154static SV *sv_async_pool_idle; /* description string */
193static AV *av_async_pool; /* idle pool */ 155static AV *av_async_pool; /* idle pool */
194static SV *sv_Coro; /* class string */ 156static SV *sv_Coro; /* class string */
195static CV *cv_pool_handler; 157static CV *cv_pool_handler;
196static CV *cv_coro_state_new;
197 158
198/* Coro::AnyEvent */ 159/* Coro::AnyEvent */
199static SV *sv_activity; 160static SV *sv_activity;
161
162/* enable processtime/realtime profiling */
163static char enable_times;
164typedef U32 coro_ts[2];
165static coro_ts time_real, time_cpu;
166static char times_valid;
200 167
201static struct coro_cctx *cctx_first; 168static struct coro_cctx *cctx_first;
202static int cctx_count, cctx_idle; 169static int cctx_count, cctx_idle;
203 170
204enum { 171enum {
… …
230 int valgrind_id; 197 int valgrind_id;
231#endif 198#endif
232 unsigned char flags; 199 unsigned char flags;
233} coro_cctx; 200} coro_cctx;
234 201
202static coro_cctx *cctx_current; /* the currently running cctx */
203
204/*****************************************************************************/
205
235enum { 206enum {
236 CF_RUNNING = 0x0001, /* coroutine is running */ 207 CF_RUNNING = 0x0001, /* coroutine is running */
237 CF_READY = 0x0002, /* coroutine is ready */ 208 CF_READY = 0x0002, /* coroutine is ready */
238 CF_NEW = 0x0004, /* has never been switched to */ 209 CF_NEW = 0x0004, /* has never been switched to */
239 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 210 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
211 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
212 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
240}; 213};
241 214
242/* the structure where most of the perl state is stored, overlaid on the cxstack */ 215/* the structure where most of the perl state is stored, overlaid on the cxstack */
243typedef struct 216typedef struct
244{ 217{
245 SV *defsv; 218 SV *defsv;
246 AV *defav; 219 AV *defav;
247 SV *errsv; 220 SV *errsv;
248 SV *irsgv; 221 SV *irsgv;
222 HV *hinthv;
249#define VAR(name,type) type name; 223#define VAR(name,type) type name;
250# include "state.h" 224# include "state.h"
251#undef VAR 225#undef VAR
252} perl_slots; 226} perl_slots;
253 227
… …
255 229
256/* this is a structure representing a perl-level coroutine */ 230/* this is a structure representing a perl-level coroutine */
257struct coro { 231struct coro {
258 /* the C coroutine allocated to this perl coroutine, if any */ 232 /* the C coroutine allocated to this perl coroutine, if any */
259 coro_cctx *cctx; 233 coro_cctx *cctx;
234
235 /* ready queue */
236 struct coro *next_ready;
260 237
261 /* state data */ 238 /* state data */
262 struct CoroSLF slf_frame; /* saved slf frame */ 239 struct CoroSLF slf_frame; /* saved slf frame */
263 AV *mainstack; 240 AV *mainstack;
264 perl_slots *slot; /* basically the saved sp */ 241 perl_slots *slot; /* basically the saved sp */
… …
266 CV *startcv; /* the CV to execute */ 243 CV *startcv; /* the CV to execute */
267 AV *args; /* data associated with this coroutine (initial args) */ 244 AV *args; /* data associated with this coroutine (initial args) */
268 int refcnt; /* coroutines are refcounted, yes */ 245 int refcnt; /* coroutines are refcounted, yes */
269 int flags; /* CF_ flags */ 246 int flags; /* CF_ flags */
270 HV *hv; /* the perl hash associated with this coro, if any */ 247 HV *hv; /* the perl hash associated with this coro, if any */
271 void (*on_destroy)(pTHX_ struct coro *coro);
272 248
273 /* statistics */ 249 /* statistics */
274 int usecount; /* number of transfers to this coro */ 250 int usecount; /* number of transfers to this coro */
275 251
276 /* coro process data */ 252 /* coro process data */
… …
281 /* async_pool */ 257 /* async_pool */
282 SV *saved_deffh; 258 SV *saved_deffh;
283 SV *invoke_cb; 259 SV *invoke_cb;
284 AV *invoke_av; 260 AV *invoke_av;
285 261
262 /* on_enter/on_leave */
263 AV *on_enter;
264 AV *on_leave;
265
266 /* swap_sv */
267 AV *swap_sv;
268
269 /* times */
270 coro_ts t_cpu, t_real;
271
286 /* linked list */ 272 /* linked list */
287 struct coro *next, *prev; 273 struct coro *next, *prev;
288}; 274};
289 275
290typedef struct coro *Coro__State; 276typedef struct coro *Coro__State;
291typedef struct coro *Coro__State_or_hashref; 277typedef struct coro *Coro__State_or_hashref;
292 278
293/* the following variables are effectively part of the perl context */ 279/* the following variables are effectively part of the perl context */
294/* and get copied between struct coro and these variables */ 280/* and get copied between struct coro and these variables */
295/* the mainr easonw e don't support windows process emulation */ 281/* the main reason we don't support windows process emulation */
296static struct CoroSLF slf_frame; /* the current slf frame */ 282static struct CoroSLF slf_frame; /* the current slf frame */
297 283
298/** Coro ********************************************************************/ 284/** Coro ********************************************************************/
299 285
300#define PRIO_MAX 3 286#define CORO_PRIO_MAX 3
301#define PRIO_HIGH 1 287#define CORO_PRIO_HIGH 1
302#define PRIO_NORMAL 0 288#define CORO_PRIO_NORMAL 0
303#define PRIO_LOW -1 289#define CORO_PRIO_LOW -1
304#define PRIO_IDLE -3 290#define CORO_PRIO_IDLE -3
305#define PRIO_MIN -4 291#define CORO_PRIO_MIN -4
306 292
307/* for Coro.pm */ 293/* for Coro.pm */
308static SV *coro_current; 294static SV *coro_current;
309static SV *coro_readyhook; 295static SV *coro_readyhook;
310static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 296static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
311static CV *cv_coro_run, *cv_coro_terminate; 297static CV *cv_coro_run;
312static struct coro *coro_first; 298static struct coro *coro_first;
313#define coro_nready coroapi.nready 299#define coro_nready coroapi.nready
300
301/** Coro::Select ************************************************************/
302
303static OP *(*coro_old_pp_sselect) (pTHX);
304static SV *coro_select_select;
305
306/* horrible hack, but if it works... */
307static OP *
308coro_pp_sselect (pTHX)
309{
310 dSP;
311 PUSHMARK (SP - 4); /* fake argument list */
312 XPUSHs (coro_select_select);
313 PUTBACK;
314
315 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
316 PL_op->op_flags |= OPf_STACKED;
317 PL_op->op_private = 0;
318 return PL_ppaddr [OP_ENTERSUB](aTHX);
319}
320
321/** time stuff **************************************************************/
322
323#ifdef HAS_GETTIMEOFDAY
324
325static void
326coro_u2time (pTHX_ UV ret[2])
327{
328 struct timeval tv;
329 gettimeofday (&tv, 0);
330
331 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec;
333}
334
335static double
336coro_nvtime ()
337{
338 struct timeval tv;
339 gettimeofday (&tv, 0);
340
341 return tv.tv_sec + tv.tv_usec * 1e-6;
342}
343
344static void
345time_init (pTHX)
346{
347 nvtime = coro_nvtime;
348 u2time = coro_u2time;
349}
350
351#else
352
353static void
354time_init (pTHX)
355{
356 SV **svp;
357
358 require_pv ("Time/HiRes.pm");
359
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364
365 nvtime = INT2PTR (double (*)(), SvIV (*svp));
366
367 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
368 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
369}
370
371#endif
314 372
315/** lowlevel stuff **********************************************************/ 373/** lowlevel stuff **********************************************************/
316 374
317static SV * 375static SV *
318coro_get_sv (pTHX_ const char *name, int create) 376coro_get_sv (pTHX_ const char *name, int create)
… …
342 get_hv (name, create); 400 get_hv (name, create);
343#endif 401#endif
344 return get_hv (name, create); 402 return get_hv (name, create);
345} 403}
346 404
347/* may croak */ 405INLINE void
348INLINE CV * 406coro_times_update ()
349coro_sv_2cv (pTHX_ SV *sv)
350{ 407{
408#ifdef coro_clock_gettime
409 struct timespec ts;
410
411 ts.tv_sec = ts.tv_nsec = 0;
412 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
413 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
414
415 ts.tv_sec = ts.tv_nsec = 0;
416 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
417 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
418#else
419 dTHX;
420 UV tv[2];
421
422 u2time (aTHX_ tv);
423 time_real [0] = tv [0];
424 time_real [1] = tv [1] * 1000;
425#endif
426}
427
428INLINE void
429coro_times_add (struct coro *c)
430{
431 c->t_real [1] += time_real [1];
432 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
433 c->t_real [0] += time_real [0];
434
435 c->t_cpu [1] += time_cpu [1];
436 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
437 c->t_cpu [0] += time_cpu [0];
438}
439
440INLINE void
441coro_times_sub (struct coro *c)
442{
443 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
444 c->t_real [1] -= time_real [1];
445 c->t_real [0] -= time_real [0];
446
447 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
448 c->t_cpu [1] -= time_cpu [1];
449 c->t_cpu [0] -= time_cpu [0];
450}
451
452/*****************************************************************************/
453/* magic glue */
454
455#define CORO_MAGIC_type_cv 26
456#define CORO_MAGIC_type_state PERL_MAGIC_ext
457
458#define CORO_MAGIC_NN(sv, type) \
459 (expect_true (SvMAGIC (sv)->mg_type == type) \
460 ? SvMAGIC (sv) \
461 : mg_find (sv, type))
462
463#define CORO_MAGIC(sv, type) \
464 (expect_true (SvMAGIC (sv)) \
465 ? CORO_MAGIC_NN (sv, type) \
466 : 0)
467
468#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
469#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
470
471INLINE struct coro *
472SvSTATE_ (pTHX_ SV *coro)
473{
351 HV *st; 474 HV *stash;
352 GV *gvp; 475 MAGIC *mg;
353 return sv_2cv (sv, &st, &gvp, 0); 476
477 if (SvROK (coro))
478 coro = SvRV (coro);
479
480 if (expect_false (SvTYPE (coro) != SVt_PVHV))
481 croak ("Coro::State object required");
482
483 stash = SvSTASH (coro);
484 if (expect_false (stash != coro_stash && stash != coro_state_stash))
485 {
486 /* very slow, but rare, check */
487 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
488 croak ("Coro::State object required");
489 }
490
491 mg = CORO_MAGIC_state (coro);
492 return (struct coro *)mg->mg_ptr;
354} 493}
494
495#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
496
497/* faster than SvSTATE, but expects a coroutine hv */
498#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
499#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
500
501/*****************************************************************************/
502/* padlist management and caching */
355 503
356static AV * 504static AV *
357coro_derive_padlist (pTHX_ CV *cv) 505coro_derive_padlist (pTHX_ CV *cv)
358{ 506{
359 AV *padlist = CvPADLIST (cv); 507 AV *padlist = CvPADLIST (cv);
… …
367 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 515 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
368#endif 516#endif
369 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 517 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
370 --AvFILLp (padlist); 518 --AvFILLp (padlist);
371 519
372 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 520 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
373 av_store (newpadlist, 1, (SV *)newpad); 521 av_store (newpadlist, 1, (SV *)newpad);
374 522
375 return newpadlist; 523 return newpadlist;
376} 524}
377 525
378static void 526static void
379free_padlist (pTHX_ AV *padlist) 527free_padlist (pTHX_ AV *padlist)
380{ 528{
381 /* may be during global destruction */ 529 /* may be during global destruction */
382 if (SvREFCNT (padlist)) 530 if (!IN_DESTRUCT)
383 { 531 {
384 I32 i = AvFILLp (padlist); 532 I32 i = AvFILLp (padlist);
385 while (i >= 0) 533
534 while (i > 0) /* special-case index 0 */
386 { 535 {
387 SV **svp = av_fetch (padlist, i--, FALSE); 536 /* we try to be extra-careful here */
388 if (svp) 537 AV *av = (AV *)AvARRAY (padlist)[i--];
389 { 538 I32 j = AvFILLp (av);
390 SV *sv; 539
391 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 540 while (j >= 0)
541 SvREFCNT_dec (AvARRAY (av)[j--]);
542
543 AvFILLp (av) = -1;
392 SvREFCNT_dec (sv); 544 SvREFCNT_dec (av);
393
394 SvREFCNT_dec (*svp);
395 }
396 } 545 }
397 546
547 SvREFCNT_dec (AvARRAY (padlist)[0]);
548
549 AvFILLp (padlist) = -1;
398 SvREFCNT_dec ((SV*)padlist); 550 SvREFCNT_dec ((SV*)padlist);
399 } 551 }
400} 552}
401 553
402static int 554static int
403coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 555coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
404{ 556{
405 AV *padlist; 557 AV *padlist;
406 AV *av = (AV *)mg->mg_obj; 558 AV *av = (AV *)mg->mg_obj;
559
560 /* perl manages to free our internal AV and _then_ call us */
561 if (IN_DESTRUCT)
562 return 0;
407 563
408 /* casting is fun. */ 564 /* casting is fun. */
409 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 565 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
410 free_padlist (aTHX_ padlist); 566 free_padlist (aTHX_ padlist);
411 567
412 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 568 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
413 569
414 return 0; 570 return 0;
415} 571}
416
417#define CORO_MAGIC_type_cv 26
418#define CORO_MAGIC_type_state PERL_MAGIC_ext
419 572
420static MGVTBL coro_cv_vtbl = { 573static MGVTBL coro_cv_vtbl = {
421 0, 0, 0, 0, 574 0, 0, 0, 0,
422 coro_cv_free 575 coro_cv_free
423}; 576};
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 577
468/* the next two functions merely cache the padlists */ 578/* the next two functions merely cache the padlists */
469static void 579static void
470get_padlist (pTHX_ CV *cv) 580get_padlist (pTHX_ CV *cv)
471{ 581{
… …
499 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 609 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
500 610
501 av = (AV *)mg->mg_obj; 611 av = (AV *)mg->mg_obj;
502 612
503 if (expect_false (AvFILLp (av) >= AvMAX (av))) 613 if (expect_false (AvFILLp (av) >= AvMAX (av)))
504 av_extend (av, AvMAX (av) + 1); 614 av_extend (av, AvFILLp (av) + 1);
505 615
506 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
507} 617}
508 618
509/** load & save, init *******************************************************/ 619/** load & save, init *******************************************************/
620
621/* swap sv heads, at least logically */
622static void
623swap_svs (pTHX_ Coro__State c)
624{
625 int i;
626
627 for (i = 0; i <= AvFILLp (c->swap_sv); )
628 {
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666}
667
668#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro))
671
672static void
673on_enterleave_call (pTHX_ SV *cb);
510 674
511static void 675static void
512load_perl (pTHX_ Coro__State c) 676load_perl (pTHX_ Coro__State c)
513{ 677{
514 perl_slots *slot = c->slot; 678 perl_slots *slot = c->slot;
515 c->slot = 0; 679 c->slot = 0;
516 680
517 PL_mainstack = c->mainstack; 681 PL_mainstack = c->mainstack;
518 682
519 GvSV (PL_defgv) = slot->defsv; 683 GvSV (PL_defgv) = slot->defsv;
520 GvAV (PL_defgv) = slot->defav; 684 GvAV (PL_defgv) = slot->defav;
521 GvSV (PL_errgv) = slot->errsv; 685 GvSV (PL_errgv) = slot->errsv;
522 GvSV (irsgv) = slot->irsgv; 686 GvSV (irsgv) = slot->irsgv;
687 GvHV (PL_hintgv) = slot->hinthv;
523 688
524 #define VAR(name,type) PL_ ## name = slot->name; 689 #define VAR(name,type) PL_ ## name = slot->name;
525 # include "state.h" 690 # include "state.h"
526 #undef VAR 691 #undef VAR
527 692
… …
541 PUTBACK; 706 PUTBACK;
542 } 707 }
543 708
544 slf_frame = c->slf_frame; 709 slf_frame = c->slf_frame;
545 CORO_THROW = c->except; 710 CORO_THROW = c->except;
711
712 if (expect_false (enable_times))
713 {
714 if (expect_false (!times_valid))
715 coro_times_update ();
716
717 coro_times_sub (c);
718 }
719
720 if (expect_false (c->on_enter))
721 {
722 int i;
723
724 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
726 }
727
728 SWAP_SVS (c);
546} 729}
547 730
548static void 731static void
549save_perl (pTHX_ Coro__State c) 732save_perl (pTHX_ Coro__State c)
550{ 733{
734 SWAP_SVS (c);
735
736 if (expect_false (c->on_leave))
737 {
738 int i;
739
740 for (i = AvFILLp (c->on_leave); i >= 0; --i)
741 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
742 }
743
744 times_valid = 0;
745
746 if (expect_false (enable_times))
747 {
748 coro_times_update (); times_valid = 1;
749 coro_times_add (c);
750 }
751
551 c->except = CORO_THROW; 752 c->except = CORO_THROW;
552 c->slf_frame = slf_frame; 753 c->slf_frame = slf_frame;
553 754
554 { 755 {
555 dSP; 756 dSP;
… …
568 { 769 {
569 while (expect_true (cxix >= 0)) 770 while (expect_true (cxix >= 0))
570 { 771 {
571 PERL_CONTEXT *cx = &ccstk[cxix--]; 772 PERL_CONTEXT *cx = &ccstk[cxix--];
572 773
573 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 774 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
574 { 775 {
575 CV *cv = cx->blk_sub.cv; 776 CV *cv = cx->blk_sub.cv;
576 777
577 if (expect_true (CvDEPTH (cv))) 778 if (expect_true (CvDEPTH (cv)))
578 { 779 {
… …
602 /* we manually unroll here, as usually 2 slots is enough */ 803 /* we manually unroll here, as usually 2 slots is enough */
603 if (SLOT_COUNT >= 1) CXINC; 804 if (SLOT_COUNT >= 1) CXINC;
604 if (SLOT_COUNT >= 2) CXINC; 805 if (SLOT_COUNT >= 2) CXINC;
605 if (SLOT_COUNT >= 3) CXINC; 806 if (SLOT_COUNT >= 3) CXINC;
606 { 807 {
607 int i; 808 unsigned int i;
608 for (i = 3; i < SLOT_COUNT; ++i) 809 for (i = 3; i < SLOT_COUNT; ++i)
609 CXINC; 810 CXINC;
610 } 811 }
611 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 812 cxstack_ix -= SLOT_COUNT; /* undo allocation */
612 813
613 c->mainstack = PL_mainstack; 814 c->mainstack = PL_mainstack;
614 815
615 { 816 {
616 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 817 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
617 818
618 slot->defav = GvAV (PL_defgv); 819 slot->defav = GvAV (PL_defgv);
619 slot->defsv = DEFSV; 820 slot->defsv = DEFSV;
620 slot->errsv = ERRSV; 821 slot->errsv = ERRSV;
621 slot->irsgv = GvSV (irsgv); 822 slot->irsgv = GvSV (irsgv);
823 slot->hinthv = GvHV (PL_hintgv);
622 824
623 #define VAR(name,type) slot->name = PL_ ## name; 825 #define VAR(name,type) slot->name = PL_ ## name;
624 # include "state.h" 826 # include "state.h"
625 #undef VAR 827 #undef VAR
626 } 828 }
… …
753#endif 955#endif
754 956
755/* 957/*
756 * This overrides the default magic get method of %SIG elements. 958 * 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 959 * 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 960 * and instead of trying to save and restore the hash elements, we just provide
759 * readback here. 961 * 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 */ 962 */
764static int 963static int
765coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 964coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
766{ 965{
767 const char *s = MgPV_nolen_const (mg); 966 const char *s = MgPV_nolen_const (mg);
… …
820 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 1019 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
821 1020
822 if (svp) 1021 if (svp)
823 { 1022 {
824 SV *old = *svp; 1023 SV *old = *svp;
825 *svp = newSVsv (sv); 1024 *svp = SvOK (sv) ? newSVsv (sv) : 0;
826 SvREFCNT_dec (old); 1025 SvREFCNT_dec (old);
827 return 0; 1026 return 0;
828 } 1027 }
829 } 1028 }
830 1029
… …
848slf_check_repeat (pTHX_ struct CoroSLF *frame) 1047slf_check_repeat (pTHX_ struct CoroSLF *frame)
849{ 1048{
850 return 1; 1049 return 1;
851} 1050}
852 1051
853static UNOP coro_setup_op; 1052static UNOP init_perl_op;
854 1053
855static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1054static void NOINLINE /* noinline to keep it out of the transfer fast path */
856coro_setup (pTHX_ struct coro *coro) 1055init_perl (pTHX_ struct coro *coro)
857{ 1056{
858 /* 1057 /*
859 * emulate part of the perl startup here. 1058 * emulate part of the perl startup here.
860 */ 1059 */
861 coro_init_stacks (aTHX); 1060 coro_init_stacks (aTHX);
862 1061
863 PL_runops = RUNOPS_DEFAULT; 1062 PL_runops = RUNOPS_DEFAULT;
864 PL_curcop = &PL_compiling; 1063 PL_curcop = &PL_compiling;
865 PL_in_eval = EVAL_NULL; 1064 PL_in_eval = EVAL_NULL;
866 PL_comppad = 0; 1065 PL_comppad = 0;
1066 PL_comppad_name = 0;
1067 PL_comppad_name_fill = 0;
1068 PL_comppad_name_floor = 0;
867 PL_curpm = 0; 1069 PL_curpm = 0;
868 PL_curpad = 0; 1070 PL_curpad = 0;
869 PL_localizing = 0; 1071 PL_localizing = 0;
870 PL_dirty = 0;
871 PL_restartop = 0; 1072 PL_restartop = 0;
872#if PERL_VERSION_ATLEAST (5,10,0) 1073#if PERL_VERSION_ATLEAST (5,10,0)
873 PL_parser = 0; 1074 PL_parser = 0;
874#endif 1075#endif
1076 PL_hints = 0;
875 1077
876 /* recreate the die/warn hooks */ 1078 /* recreate the die/warn hooks */
877 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1079 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
878 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1080 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
879 1081
880 GvSV (PL_defgv) = newSV (0); 1082 GvSV (PL_defgv) = newSV (0);
881 GvAV (PL_defgv) = coro->args; coro->args = 0; 1083 GvAV (PL_defgv) = coro->args; coro->args = 0;
882 GvSV (PL_errgv) = newSV (0); 1084 GvSV (PL_errgv) = newSV (0);
883 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1085 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1086 GvHV (PL_hintgv) = 0;
884 PL_rs = newSVsv (GvSV (irsgv)); 1087 PL_rs = newSVsv (GvSV (irsgv));
885 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1088 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
886 1089
887 { 1090 {
888 dSP; 1091 dSP;
… …
905 */ 1108 */
906 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1109 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 */ 1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
908 1111
909 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1112 /* 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; 1113 init_perl_op.op_next = PL_op;
911 coro_setup_op.op_type = OP_ENTERSUB; 1114 init_perl_op.op_type = OP_ENTERSUB;
912 coro_setup_op.op_ppaddr = pp_slf; 1115 init_perl_op.op_ppaddr = pp_slf;
913 /* no flags etc. required, as an init function won't be called */ 1116 /* no flags etc. required, as an init function won't be called */
914 1117
915 PL_op = (OP *)&coro_setup_op; 1118 PL_op = (OP *)&init_perl_op;
916 1119
917 /* copy throw, in case it was set before coro_setup */ 1120 /* copy throw, in case it was set before init_perl */
918 CORO_THROW = coro->except; 1121 CORO_THROW = coro->except;
919}
920 1122
1123 SWAP_SVS (coro);
1124
1125 if (expect_false (enable_times))
1126 {
1127 coro_times_update ();
1128 coro_times_sub (coro);
1129 }
1130}
1131
921static void 1132static void
922coro_destruct (pTHX_ struct coro *coro) 1133coro_unwind_stacks (pTHX)
923{ 1134{
924 if (!IN_DESTRUCT) 1135 if (!IN_DESTRUCT)
925 { 1136 {
926 /* restore all saved variables and stuff */ 1137 /* restore all saved variables and stuff */
927 LEAVE_SCOPE (0); 1138 LEAVE_SCOPE (0);
… …
935 POPSTACK_TO (PL_mainstack); 1146 POPSTACK_TO (PL_mainstack);
936 1147
937 /* unwind main stack */ 1148 /* unwind main stack */
938 dounwind (-1); 1149 dounwind (-1);
939 } 1150 }
1151}
940 1152
941 SvREFCNT_dec (GvSV (PL_defgv)); 1153static void
942 SvREFCNT_dec (GvAV (PL_defgv)); 1154destroy_perl (pTHX_ struct coro *coro)
943 SvREFCNT_dec (GvSV (PL_errgv)); 1155{
944 SvREFCNT_dec (PL_defoutgv); 1156 SV *svf [9];
945 SvREFCNT_dec (PL_rs);
946 SvREFCNT_dec (GvSV (irsgv));
947 1157
948 SvREFCNT_dec (PL_diehook);
949 SvREFCNT_dec (PL_warnhook);
950 1158 {
1159 SV *old_current = SvRV (coro_current);
1160 struct coro *current = SvSTATE (old_current);
1161
1162 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1163
1164 save_perl (aTHX_ current);
1165
1166 /* this will cause transfer_check to croak on block*/
1167 SvRV_set (coro_current, (SV *)coro->hv);
1168
1169 load_perl (aTHX_ coro);
1170
1171 coro_unwind_stacks (aTHX);
1172 coro_destruct_stacks (aTHX);
1173
1174 /* restore swapped sv's */
1175 SWAP_SVS (coro);
1176
1177 // now save some sv's to be free'd later
1178 svf [0] = GvSV (PL_defgv);
1179 svf [1] = (SV *)GvAV (PL_defgv);
1180 svf [2] = GvSV (PL_errgv);
1181 svf [3] = (SV *)PL_defoutgv;
1182 svf [4] = PL_rs;
1183 svf [5] = GvSV (irsgv);
1184 svf [6] = (SV *)GvHV (PL_hintgv);
1185 svf [7] = PL_diehook;
1186 svf [8] = PL_warnhook;
1187 assert (9 == sizeof (svf) / sizeof (*svf));
1188
1189 SvRV_set (coro_current, old_current);
1190
1191 load_perl (aTHX_ current);
1192 }
1193
1194 {
1195 unsigned int i;
1196
1197 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1198 SvREFCNT_dec (svf [i]);
1199
951 SvREFCNT_dec (coro->saved_deffh); 1200 SvREFCNT_dec (coro->saved_deffh);
952 SvREFCNT_dec (coro->rouse_cb); 1201 SvREFCNT_dec (coro->rouse_cb);
953 SvREFCNT_dec (coro->invoke_cb); 1202 SvREFCNT_dec (coro->invoke_cb);
954 SvREFCNT_dec (coro->invoke_av); 1203 SvREFCNT_dec (coro->invoke_av);
955 1204 }
956 coro_destruct_stacks (aTHX);
957} 1205}
958 1206
959INLINE void 1207INLINE void
960free_coro_mortal (pTHX) 1208free_coro_mortal (pTHX)
961{ 1209{
… …
969static int 1217static int
970runops_trace (pTHX) 1218runops_trace (pTHX)
971{ 1219{
972 COP *oldcop = 0; 1220 COP *oldcop = 0;
973 int oldcxix = -2; 1221 int oldcxix = -2;
974 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
975 coro_cctx *cctx = coro->cctx;
976 1222
977 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1223 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
978 { 1224 {
979 PERL_ASYNC_CHECK (); 1225 PERL_ASYNC_CHECK ();
980 1226
981 if (cctx->flags & CC_TRACE_ALL) 1227 if (cctx_current->flags & CC_TRACE_ALL)
982 { 1228 {
983 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1229 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
984 { 1230 {
985 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1231 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
986 SV **bot, **top; 1232 SV **bot, **top;
987 AV *av = newAV (); /* return values */ 1233 AV *av = newAV (); /* return values */
988 SV **cb; 1234 SV **cb;
… …
1025 1271
1026 if (PL_curcop != &PL_compiling) 1272 if (PL_curcop != &PL_compiling)
1027 { 1273 {
1028 SV **cb; 1274 SV **cb;
1029 1275
1030 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1276 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1031 { 1277 {
1032 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1278 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1033 1279
1034 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1280 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1035 { 1281 {
… …
1058 } 1304 }
1059 1305
1060 oldcxix = cxstack_ix; 1306 oldcxix = cxstack_ix;
1061 } 1307 }
1062 1308
1063 if (cctx->flags & CC_TRACE_LINE) 1309 if (cctx_current->flags & CC_TRACE_LINE)
1064 { 1310 {
1065 dSP; 1311 dSP;
1066 1312
1067 PL_runops = RUNOPS_DEFAULT; 1313 PL_runops = RUNOPS_DEFAULT;
1068 ENTER; 1314 ENTER;
… …
1087 1333
1088 TAINT_NOT; 1334 TAINT_NOT;
1089 return 0; 1335 return 0;
1090} 1336}
1091 1337
1092static struct coro_cctx *cctx_ssl_cctx;
1093static struct CoroSLF cctx_ssl_frame; 1338static struct CoroSLF cctx_ssl_frame;
1094 1339
1095static void 1340static void
1096slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1341slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1097{ 1342{
1098 ta->prev = (struct coro *)cctx_ssl_cctx;
1099 ta->next = 0; 1343 ta->prev = 0;
1100} 1344}
1101 1345
1102static int 1346static int
1103slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1347slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1104{ 1348{
… …
1107 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1351 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1108} 1352}
1109 1353
1110/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1354/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1111static void NOINLINE 1355static void NOINLINE
1112cctx_prepare (pTHX_ coro_cctx *cctx) 1356cctx_prepare (pTHX)
1113{ 1357{
1114 PL_top_env = &PL_start_env; 1358 PL_top_env = &PL_start_env;
1115 1359
1116 if (cctx->flags & CC_TRACE) 1360 if (cctx_current->flags & CC_TRACE)
1117 PL_runops = runops_trace; 1361 PL_runops = runops_trace;
1118 1362
1119 /* we already must be executing an SLF op, there is no other valid way 1363 /* we already must be executing an SLF op, there is no other valid way
1120 * that can lead to creation of a new cctx */ 1364 * that can lead to creation of a new cctx */
1121 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1365 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1122 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1366 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1123 1367
1124 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1368 /* 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; 1369 cctx_ssl_frame = slf_frame;
1127 1370
1128 slf_frame.prepare = slf_prepare_set_stacklevel; 1371 slf_frame.prepare = slf_prepare_set_stacklevel;
1129 slf_frame.check = slf_check_set_stacklevel; 1372 slf_frame.check = slf_check_set_stacklevel;
1130} 1373}
… …
1153 /* normally we would need to skip the entersub here */ 1396 /* normally we would need to skip the entersub here */
1154 /* not doing so will re-execute it, which is exactly what we want */ 1397 /* not doing so will re-execute it, which is exactly what we want */
1155 /* PL_nop = PL_nop->op_next */ 1398 /* PL_nop = PL_nop->op_next */
1156 1399
1157 /* inject a fake subroutine call to cctx_init */ 1400 /* inject a fake subroutine call to cctx_init */
1158 cctx_prepare (aTHX_ (coro_cctx *)arg); 1401 cctx_prepare (aTHX);
1159 1402
1160 /* cctx_run is the alternative tail of transfer() */ 1403 /* cctx_run is the alternative tail of transfer() */
1161 transfer_tail (aTHX); 1404 transfer_tail (aTHX);
1162 1405
1163 /* somebody or something will hit me for both perl_run and PL_restartop */ 1406 /* somebody or something will hit me for both perl_run and PL_restartop */
1164 PL_restartop = PL_op; 1407 PL_restartop = PL_op;
1165 perl_run (PL_curinterp); 1408 perl_run (PL_curinterp);
1166 /* 1409 /*
1167 * Unfortunately, there is no way to get at the return values of the 1410 * Unfortunately, there is no way to get at the return values of the
1168 * coro body here, as perl_run destroys these 1411 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1412 * runtime errors here, as this is just a random interpreter, not a thread.
1169 */ 1413 */
1170 1414
1171 /* 1415 /*
1172 * If perl-run returns we assume exit() was being called or the coro 1416 * 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) 1417 * 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 1418 * 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" 1419 * bootstrap-time "top" top_env, as we cannot restore the "main"
1176 * coroutine as Coro has no such concept 1420 * coroutine as Coro has no such concept.
1421 * This actually isn't valid with the pthread backend, but OSes requiring
1422 * that backend are too broken to do it in a standards-compliant way.
1177 */ 1423 */
1178 PL_top_env = main_top_env; 1424 PL_top_env = main_top_env;
1179 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1425 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1180 } 1426 }
1181} 1427}
… …
1258cctx_destroy (coro_cctx *cctx) 1504cctx_destroy (coro_cctx *cctx)
1259{ 1505{
1260 if (!cctx) 1506 if (!cctx)
1261 return; 1507 return;
1262 1508
1509 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1510
1263 --cctx_count; 1511 --cctx_count;
1264 coro_destroy (&cctx->cctx); 1512 coro_destroy (&cctx->cctx);
1265 1513
1266 /* coro_transfer creates new, empty cctx's */ 1514 /* coro_transfer creates new, empty cctx's */
1267 if (cctx->sptr) 1515 if (cctx->sptr)
… …
1330 /* TODO: throwing up here is considered harmful */ 1578 /* TODO: throwing up here is considered harmful */
1331 1579
1332 if (expect_true (prev != next)) 1580 if (expect_true (prev != next))
1333 { 1581 {
1334 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1582 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,"); 1583 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1336 1584
1337 if (expect_false (next->flags & CF_RUNNING))
1338 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1339
1340 if (expect_false (next->flags & CF_DESTROYED)) 1585 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1341 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1586 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1342 1587
1343#if !PERL_VERSION_ATLEAST (5,10,0) 1588#if !PERL_VERSION_ATLEAST (5,10,0)
1344 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1589 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,"); 1590 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1346#endif 1591#endif
… …
1352transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1597transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1353{ 1598{
1354 dSTACKLEVEL; 1599 dSTACKLEVEL;
1355 1600
1356 /* sometimes transfer is only called to set idle_sp */ 1601 /* sometimes transfer is only called to set idle_sp */
1357 if (expect_false (!next)) 1602 if (expect_false (!prev))
1358 { 1603 {
1359 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1604 cctx_current->idle_sp = STACKLEVEL;
1360 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1605 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1361 } 1606 }
1362 else if (expect_true (prev != next)) 1607 else if (expect_true (prev != next))
1363 { 1608 {
1364 coro_cctx *prev__cctx; 1609 coro_cctx *cctx_prev;
1365 1610
1366 if (expect_false (prev->flags & CF_NEW)) 1611 if (expect_false (prev->flags & CF_NEW))
1367 { 1612 {
1368 /* create a new empty/source context */ 1613 /* create a new empty/source context */
1369 prev->cctx = cctx_new_empty ();
1370 prev->flags &= ~CF_NEW; 1614 prev->flags &= ~CF_NEW;
1371 prev->flags |= CF_RUNNING; 1615 prev->flags |= CF_RUNNING;
1372 } 1616 }
1373 1617
1374 prev->flags &= ~CF_RUNNING; 1618 prev->flags &= ~CF_RUNNING;
… …
1380 if (expect_false (next->flags & CF_NEW)) 1624 if (expect_false (next->flags & CF_NEW))
1381 { 1625 {
1382 /* need to start coroutine */ 1626 /* need to start coroutine */
1383 next->flags &= ~CF_NEW; 1627 next->flags &= ~CF_NEW;
1384 /* setup coroutine call */ 1628 /* setup coroutine call */
1385 coro_setup (aTHX_ next); 1629 init_perl (aTHX_ next);
1386 } 1630 }
1387 else 1631 else
1388 load_perl (aTHX_ next); 1632 load_perl (aTHX_ next);
1389 1633
1390 prev__cctx = prev->cctx;
1391
1392 /* possibly untie and reuse the cctx */ 1634 /* possibly untie and reuse the cctx */
1393 if (expect_true ( 1635 if (expect_true (
1394 prev__cctx->idle_sp == STACKLEVEL 1636 cctx_current->idle_sp == STACKLEVEL
1395 && !(prev__cctx->flags & CC_TRACE) 1637 && !(cctx_current->flags & CC_TRACE)
1396 && !force_cctx 1638 && !force_cctx
1397 )) 1639 ))
1398 { 1640 {
1399 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1641 /* 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)); 1642 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1401 1643
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 */ 1644 /* 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 */ 1645 /* without this the next cctx_get might destroy the running cctx while still in use */
1406 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1646 if (expect_false (CCTX_EXPIRED (cctx_current)))
1407 if (!next->cctx) 1647 if (expect_true (!next->cctx))
1408 next->cctx = cctx_get (aTHX); 1648 next->cctx = cctx_get (aTHX);
1409 1649
1410 cctx_put (prev__cctx); 1650 cctx_put (cctx_current);
1411 } 1651 }
1652 else
1653 prev->cctx = cctx_current;
1412 1654
1413 ++next->usecount; 1655 ++next->usecount;
1414 1656
1415 if (expect_true (!next->cctx)) 1657 cctx_prev = cctx_current;
1416 next->cctx = cctx_get (aTHX); 1658 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1417 1659
1418 if (expect_false (prev__cctx != next->cctx)) 1660 next->cctx = 0;
1661
1662 if (expect_false (cctx_prev != cctx_current))
1419 { 1663 {
1420 prev__cctx->top_env = PL_top_env; 1664 cctx_prev->top_env = PL_top_env;
1421 PL_top_env = next->cctx->top_env; 1665 PL_top_env = cctx_current->top_env;
1422 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1666 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1423 } 1667 }
1424 1668
1425 transfer_tail (aTHX); 1669 transfer_tail (aTHX);
1426 } 1670 }
1427} 1671}
… …
1429#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1673#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) 1674#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1431 1675
1432/** high level stuff ********************************************************/ 1676/** high level stuff ********************************************************/
1433 1677
1434static int 1678static void
1435coro_state_destroy (pTHX_ struct coro *coro) 1679coro_state_destroy (pTHX_ struct coro *coro)
1436{ 1680{
1437 if (coro->flags & CF_DESTROYED) 1681 if (coro->flags & CF_DESTROYED)
1438 return 0; 1682 return;
1439 1683
1440 if (coro->on_destroy)
1441 coro->on_destroy (aTHX_ coro); 1684 slf_destroy (aTHX_ coro);
1442 1685
1443 coro->flags |= CF_DESTROYED; 1686 coro->flags |= CF_DESTROYED;
1444 1687
1445 if (coro->flags & CF_READY) 1688 if (coro->flags & CF_READY)
1446 { 1689 {
… …
1449 --coro_nready; 1692 --coro_nready;
1450 } 1693 }
1451 else 1694 else
1452 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1695 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1453 1696
1454 if (coro->mainstack && coro->mainstack != main_mainstack) 1697 if (coro->mainstack
1455 { 1698 && coro->mainstack != main_mainstack
1456 struct coro temp; 1699 && coro->slot
1457 1700 && !PL_dirty)
1458 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1459
1460 save_perl (aTHX_ &temp);
1461 load_perl (aTHX_ coro); 1701 destroy_perl (aTHX_ coro);
1462 1702
1463 coro_destruct (aTHX_ coro); 1703 if (coro->next) coro->next->prev = coro->prev;
1464 1704 if (coro->prev) coro->prev->next = coro->next;
1465 load_perl (aTHX_ &temp); 1705 if (coro == coro_first) coro_first = coro->next;
1466
1467 coro->slot = 0;
1468 }
1469 1706
1470 cctx_destroy (coro->cctx); 1707 cctx_destroy (coro->cctx);
1471 SvREFCNT_dec (coro->startcv); 1708 SvREFCNT_dec (coro->startcv);
1472 SvREFCNT_dec (coro->args); 1709 SvREFCNT_dec (coro->args);
1710 SvREFCNT_dec (coro->swap_sv);
1473 SvREFCNT_dec (CORO_THROW); 1711 SvREFCNT_dec (CORO_THROW);
1474
1475 if (coro->next) coro->next->prev = coro->prev;
1476 if (coro->prev) coro->prev->next = coro->next;
1477 if (coro == coro_first) coro_first = coro->next;
1478
1479 return 1;
1480} 1712}
1481 1713
1482static int 1714static int
1483coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1715coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1484{ 1716{
… …
1532 1764
1533 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1765 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1534 TRANSFER (ta, 1); 1766 TRANSFER (ta, 1);
1535} 1767}
1536 1768
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 ********************************************************************/ 1769/** Coro ********************************************************************/
1561 1770
1562INLINE void 1771INLINE void
1563coro_enq (pTHX_ struct coro *coro) 1772coro_enq (pTHX_ struct coro *coro)
1564{ 1773{
1565 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1774 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1566}
1567 1775
1568INLINE SV * 1776 SvREFCNT_inc_NN (coro->hv);
1777
1778 coro->next_ready = 0;
1779 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1780 ready [1] = coro;
1781}
1782
1783INLINE struct coro *
1569coro_deq (pTHX) 1784coro_deq (pTHX)
1570{ 1785{
1571 int prio; 1786 int prio;
1572 1787
1573 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1788 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1574 if (AvFILLp (coro_ready [prio]) >= 0) 1789 {
1575 return av_shift (coro_ready [prio]); 1790 struct coro **ready = coro_ready [prio];
1791
1792 if (ready [0])
1793 {
1794 struct coro *coro = ready [0];
1795 ready [0] = coro->next_ready;
1796 return coro;
1797 }
1798 }
1576 1799
1577 return 0; 1800 return 0;
1801}
1802
1803static void
1804invoke_sv_ready_hook_helper (void)
1805{
1806 dTHX;
1807 dSP;
1808
1809 ENTER;
1810 SAVETMPS;
1811
1812 PUSHMARK (SP);
1813 PUTBACK;
1814 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1815
1816 FREETMPS;
1817 LEAVE;
1578} 1818}
1579 1819
1580static int 1820static int
1581api_ready (pTHX_ SV *coro_sv) 1821api_ready (pTHX_ SV *coro_sv)
1582{ 1822{
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); 1823 struct coro *coro = SvSTATE (coro_sv);
1591 1824
1592 if (coro->flags & CF_READY) 1825 if (coro->flags & CF_READY)
1593 return 0; 1826 return 0;
1594 1827
1595 coro->flags |= CF_READY; 1828 coro->flags |= CF_READY;
1596 1829
1597 sv_hook = coro_nready ? 0 : coro_readyhook;
1598 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1599
1600 coro_enq (aTHX_ coro); 1830 coro_enq (aTHX_ coro);
1601 ++coro_nready;
1602 1831
1603 if (sv_hook) 1832 if (!coro_nready++)
1604 { 1833 if (coroapi.readyhook)
1605 dSP; 1834 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 1835
1621 return 1; 1836 return 1;
1622} 1837}
1623 1838
1624static int 1839static int
… …
1647static void 1862static void
1648prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1863prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1649{ 1864{
1650 for (;;) 1865 for (;;)
1651 { 1866 {
1652 SV *next_sv = coro_deq (aTHX); 1867 struct coro *next = coro_deq (aTHX);
1653 1868
1654 if (expect_true (next_sv)) 1869 if (expect_true (next))
1655 { 1870 {
1656 struct coro *next = SvSTATE_hv (next_sv);
1657
1658 /* cannot transfer to destroyed coros, skip and look for next */ 1871 /* cannot transfer to destroyed coros, skip and look for next */
1659 if (expect_false (next->flags & CF_DESTROYED)) 1872 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1660 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1873 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1661 else 1874 else
1662 { 1875 {
1663 next->flags &= ~CF_READY; 1876 next->flags &= ~CF_READY;
1664 --coro_nready; 1877 --coro_nready;
1665 1878
… …
1668 } 1881 }
1669 } 1882 }
1670 else 1883 else
1671 { 1884 {
1672 /* nothing to schedule: call the idle handler */ 1885 /* nothing to schedule: call the idle handler */
1886 if (SvROK (sv_idle)
1887 && SvOBJECT (SvRV (sv_idle)))
1888 {
1889 if (SvRV (sv_idle) == SvRV (coro_current))
1890 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1891
1892 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1893 api_ready (aTHX_ SvRV (sv_idle));
1894 --coro_nready;
1895 }
1896 else
1897 {
1898 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1673 dSP; 1899 dSP;
1674 1900
1675 ENTER; 1901 ENTER;
1676 SAVETMPS; 1902 SAVETMPS;
1677 1903
1678 PUSHMARK (SP); 1904 PUSHMARK (SP);
1679 PUTBACK; 1905 PUTBACK;
1680 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD); 1906 call_sv (sv_idle, G_VOID | G_DISCARD);
1681 1907
1682 FREETMPS; 1908 FREETMPS;
1683 LEAVE; 1909 LEAVE;
1910 }
1684 } 1911 }
1685 } 1912 }
1686} 1913}
1687 1914
1688INLINE void 1915INLINE void
… …
1759static void 1986static void
1760api_trace (pTHX_ SV *coro_sv, int flags) 1987api_trace (pTHX_ SV *coro_sv, int flags)
1761{ 1988{
1762 struct coro *coro = SvSTATE (coro_sv); 1989 struct coro *coro = SvSTATE (coro_sv);
1763 1990
1991 if (coro->flags & CF_RUNNING)
1992 croak ("cannot enable tracing on a running coroutine, caught");
1993
1764 if (flags & CC_TRACE) 1994 if (flags & CC_TRACE)
1765 { 1995 {
1766 if (!coro->cctx) 1996 if (!coro->cctx)
1767 coro->cctx = cctx_new_run (); 1997 coro->cctx = cctx_new_run ();
1768 else if (!(coro->cctx->flags & CC_TRACE)) 1998 else if (!(coro->cctx->flags & CC_TRACE))
1769 croak ("cannot enable tracing on coroutine with custom stack,"); 1999 croak ("cannot enable tracing on coroutine with custom stack, caught");
1770 2000
1771 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 2001 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1772 } 2002 }
1773 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 2003 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1774 { 2004 {
… …
1783 2013
1784static void 2014static void
1785coro_call_on_destroy (pTHX_ struct coro *coro) 2015coro_call_on_destroy (pTHX_ struct coro *coro)
1786{ 2016{
1787 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2017 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1788 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1789 2018
1790 if (on_destroyp) 2019 if (on_destroyp)
1791 { 2020 {
1792 AV *on_destroy = (AV *)SvRV (*on_destroyp); 2021 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2022 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2023 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
1793 2024
1794 while (AvFILLp (on_destroy) >= 0) 2025 while (AvFILLp (on_destroy) >= 0)
1795 { 2026 {
1796 dSP; /* don't disturb outer sp */ 2027 dSP; /* don't disturb outer sp */
1797 SV *cb = av_pop (on_destroy); 2028 SV *cb = av_pop (on_destroy);
… …
1799 PUSHMARK (SP); 2030 PUSHMARK (SP);
1800 2031
1801 if (statusp) 2032 if (statusp)
1802 { 2033 {
1803 int i; 2034 int i;
1804 AV *status = (AV *)SvRV (*statusp);
1805 EXTEND (SP, AvFILLp (status) + 1); 2035 EXTEND (SP, AvFILLp (status) + 1);
1806 2036
1807 for (i = 0; i <= AvFILLp (status); ++i) 2037 for (i = 0; i <= AvFILLp (status); ++i)
1808 PUSHs (AvARRAY (status)[i]); 2038 PUSHs (AvARRAY (status)[i]);
1809 } 2039 }
… …
1813 } 2043 }
1814 } 2044 }
1815} 2045}
1816 2046
1817static void 2047static void
1818slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2048coro_set_status (HV *coro_hv, SV **arg, int items)
1819{ 2049{
1820 int i;
1821 HV *hv = (HV *)SvRV (coro_current);
1822 AV *av = newAV (); 2050 AV *av = newAV ();
1823 2051
2052 /* items are actually not so common, so optimise for this case */
2053 if (items)
2054 {
2055 int i;
2056
1824 av_extend (av, items - 1); 2057 av_extend (av, items - 1);
2058
1825 for (i = 0; i < items; ++i) 2059 for (i = 0; i < items; ++i)
1826 av_push (av, SvREFCNT_inc_NN (arg [i])); 2060 av_push (av, SvREFCNT_inc_NN (arg [i]));
2061 }
1827 2062
1828 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2063 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2064}
1829 2065
2066static void
2067slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2068{
1830 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2069 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1831 api_ready (aTHX_ sv_manager); 2070 api_ready (aTHX_ sv_manager);
1832 2071
1833 frame->prepare = prepare_schedule; 2072 frame->prepare = prepare_schedule;
1834 frame->check = slf_check_repeat; 2073 frame->check = slf_check_repeat;
2074
2075 /* as a minor optimisation, we could unwind all stacks here */
2076 /* but that puts extra pressure on pp_slf, and is not worth much */
2077 /*coro_unwind_stacks (aTHX);*/
2078}
2079
2080static void
2081slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2082{
2083 HV *coro_hv = (HV *)SvRV (coro_current);
2084
2085 coro_set_status (coro_hv, arg, items);
2086 slf_init_terminate_cancel_common (frame, coro_hv);
2087}
2088
2089static void
2090slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2091{
2092 HV *coro_hv;
2093 struct coro *coro;
2094
2095 if (items <= 0)
2096 croak ("Coro::cancel called without coro object,");
2097
2098 coro = SvSTATE (arg [0]);
2099 coro_hv = coro->hv;
2100
2101 coro_set_status (coro_hv, arg + 1, items - 1);
2102
2103 if (expect_false (coro->flags & CF_NOCANCEL))
2104 {
2105 /* coro currently busy cancelling something, so just notify it */
2106 coro->slf_frame.data = (void *)coro;
2107
2108 frame->prepare = prepare_nop;
2109 frame->check = slf_check_nop;
2110 }
2111 else if (coro_hv == (HV *)SvRV (coro_current))
2112 {
2113 /* cancelling the current coro is allowed, and equals terminate */
2114 slf_init_terminate_cancel_common (frame, coro_hv);
2115 }
2116 else
2117 {
2118 struct coro *self = SvSTATE_current;
2119
2120 /* otherwise we cancel directly, purely for speed reasons
2121 * unfortunately, this requires some magic trickery, as
2122 * somebody else could cancel us, so we have to fight the cancellation.
2123 * this is ugly, and hopefully fully worth the extra speed.
2124 * besides, I can't get the slow-but-safe version working...
2125 */
2126 slf_frame.data = 0;
2127 self->flags |= CF_NOCANCEL;
2128
2129 coro_state_destroy (aTHX_ coro);
2130 coro_call_on_destroy (aTHX_ coro);
2131
2132 self->flags &= ~CF_NOCANCEL;
2133
2134 if (slf_frame.data)
2135 {
2136 /* while we were busy we have been cancelled, so terminate */
2137 slf_init_terminate_cancel_common (frame, self->hv);
2138 }
2139 else
2140 {
2141 frame->prepare = prepare_nop;
2142 frame->check = slf_check_nop;
2143 }
2144 }
2145}
2146
2147static int
2148slf_check_safe_cancel (pTHX_ struct CoroSLF *frame)
2149{
2150 frame->prepare = 0;
2151 coro_unwind_stacks ();
2152
2153 slf_init_terminate_cancel_common (aTHX_ frame, (HV *)SvRV (coro_current));
2154
2155 return 1;
2156}
2157
2158static int
2159safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2160{
2161 if (coro->cctx)
2162 croak ("coro inside C callback, unable to cancel at this time, caught");
2163
2164 if (coro->flags & CF_NEW)
2165 {
2166 coro_set_status (coro->hv, arg, items);
2167 coro_state_destroy (aTHX_ coro);
2168 coro_call_on_destroy (aTHX_ coro);
2169 }
2170 else
2171 {
2172 if (!coro->slf_frame.prepare)
2173 croak ("coro outside an SLF function, unable to cancel at this time, caught");
2174
2175 slf_destroy (coro);
2176
2177 coro_set_status (coro->hv, arg, items);
2178 coro->slf_frame.prepare = prepare_nop;
2179 coro->slf_frame.check = slf_check_safe_cancel;
2180
2181 api_ready (aTHX_ coro->hv);
2182 }
2183
2184 return 1;
1835} 2185}
1836 2186
1837/*****************************************************************************/ 2187/*****************************************************************************/
1838/* async pool handler */ 2188/* async pool handler */
1839 2189
… …
1879 coro->saved_deffh = 0; 2229 coro->saved_deffh = 0;
1880 2230
1881 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss) 2231 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1882 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2232 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1883 { 2233 {
1884 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate); 2234 slf_init_terminate_cancel_common (aTHX_ frame, hv);
1885 coro->invoke_av = newAV (); 2235 return;
1886
1887 frame->prepare = prepare_nop;
1888 } 2236 }
1889 else 2237 else
1890 { 2238 {
1891 av_clear (GvAV (PL_defgv)); 2239 av_clear (GvAV (PL_defgv));
1892 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2240 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
… …
1917 2265
1918static void 2266static void
1919coro_rouse_callback (pTHX_ CV *cv) 2267coro_rouse_callback (pTHX_ CV *cv)
1920{ 2268{
1921 dXSARGS; 2269 dXSARGS;
1922 SV *data = (SV *)GENSUB_ARG; 2270 SV *data = (SV *)S_GENSUB_ARG;
1923 2271
1924 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2272 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1925 { 2273 {
1926 /* first call, set args */ 2274 /* first call, set args */
2275 SV *coro = SvRV (data);
1927 AV *av = newAV (); 2276 AV *av = newAV ();
1928 SV *coro = SvRV (data);
1929 2277
1930 SvRV_set (data, (SV *)av); 2278 SvRV_set (data, (SV *)av);
1931 api_ready (aTHX_ coro);
1932 SvREFCNT_dec (coro);
1933 2279
1934 /* better take a full copy of the arguments */ 2280 /* better take a full copy of the arguments */
1935 while (items--) 2281 while (items--)
1936 av_store (av, items, newSVsv (ST (items))); 2282 av_store (av, items, newSVsv (ST (items)));
2283
2284 api_ready (aTHX_ coro);
2285 SvREFCNT_dec (coro);
1937 } 2286 }
1938 2287
1939 XSRETURN_EMPTY; 2288 XSRETURN_EMPTY;
1940} 2289}
1941 2290
… …
1958 2307
1959 EXTEND (SP, AvFILLp (av) + 1); 2308 EXTEND (SP, AvFILLp (av) + 1);
1960 for (i = 0; i <= AvFILLp (av); ++i) 2309 for (i = 0; i <= AvFILLp (av); ++i)
1961 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2310 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1962 2311
1963 /* we have stolen the elements, so ste length to zero and free */ 2312 /* we have stolen the elements, so set length to zero and free */
1964 AvFILLp (av) = -1; 2313 AvFILLp (av) = -1;
1965 av_undef (av); 2314 av_undef (av);
1966 2315
1967 PUTBACK; 2316 PUTBACK;
1968 } 2317 }
… …
1992 || SvTYPE (SvRV (cb)) != SVt_PVCV 2341 || SvTYPE (SvRV (cb)) != SVt_PVCV
1993 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2342 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1994 croak ("Coro::rouse_wait called with illegal callback argument,"); 2343 croak ("Coro::rouse_wait called with illegal callback argument,");
1995 2344
1996 { 2345 {
1997 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2346 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1998 SV *data = (SV *)GENSUB_ARG; 2347 SV *data = (SV *)S_GENSUB_ARG;
1999 2348
2000 frame->data = (void *)data; 2349 frame->data = (void *)data;
2001 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2350 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
2002 frame->check = slf_check_rouse_wait; 2351 frame->check = slf_check_rouse_wait;
2003 } 2352 }
… …
2007coro_new_rouse_cb (pTHX) 2356coro_new_rouse_cb (pTHX)
2008{ 2357{
2009 HV *hv = (HV *)SvRV (coro_current); 2358 HV *hv = (HV *)SvRV (coro_current);
2010 struct coro *coro = SvSTATE_hv (hv); 2359 struct coro *coro = SvSTATE_hv (hv);
2011 SV *data = newRV_inc ((SV *)hv); 2360 SV *data = newRV_inc ((SV *)hv);
2012 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2361 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2013 2362
2014 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2363 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2015 SvREFCNT_dec (data); /* magicext increases the refcount */ 2364 SvREFCNT_dec (data); /* magicext increases the refcount */
2016 2365
2017 SvREFCNT_dec (coro->rouse_cb); 2366 SvREFCNT_dec (coro->rouse_cb);
… …
2114static void 2463static void
2115slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2464slf_init_cede_notself (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2116{ 2465{
2117 frame->prepare = prepare_cede_notself; 2466 frame->prepare = prepare_cede_notself;
2118 frame->check = slf_check_nop; 2467 frame->check = slf_check_nop;
2468}
2469
2470/* "undo"/cancel a running slf call - used when cancelling a coro, mainly */
2471static void
2472slf_destroy (pTHX_ struct coro *coro)
2473{
2474 /* this callback is reserved for slf functions needing to do cleanup */
2475 if (coro->slf_frame.destroy && coro->slf_frame.prepare && !PL_dirty)
2476 coro->slf_frame.destroy (aTHX_ coro);
2477
2478 /*
2479 * The on_destroy above most likely is from an SLF call.
2480 * Since by definition the SLF call will not finish when we destroy
2481 * the coro, we will have to force-finish it here, otherwise
2482 * cleanup functions cannot call SLF functions.
2483 */
2484 coro->slf_frame.prepare = 0;
2119} 2485}
2120 2486
2121/* 2487/*
2122 * these not obviously related functions are all rolled into one 2488 * these not obviously related functions are all rolled into one
2123 * function to increase chances that they all will call transfer with the same 2489 * function to increase chances that they all will call transfer with the same
… …
2242 if (PL_op->op_flags & OPf_STACKED) 2608 if (PL_op->op_flags & OPf_STACKED)
2243 { 2609 {
2244 if (items > slf_arga) 2610 if (items > slf_arga)
2245 { 2611 {
2246 slf_arga = items; 2612 slf_arga = items;
2247 free (slf_argv); 2613 Safefree (slf_argv);
2248 slf_argv = malloc (slf_arga * sizeof (SV *)); 2614 New (0, slf_argv, slf_arga, SV *);
2249 } 2615 }
2250 2616
2251 slf_argc = items; 2617 slf_argc = items;
2252 2618
2253 for (i = 0; i < items; ++i) 2619 for (i = 0; i < items; ++i)
… …
2258 2624
2259 PL_op->op_ppaddr = pp_slf; 2625 PL_op->op_ppaddr = pp_slf;
2260 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2626 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2261 2627
2262 PL_op = (OP *)&slf_restore; 2628 PL_op = (OP *)&slf_restore;
2629}
2630
2631/*****************************************************************************/
2632/* dynamic wind */
2633
2634static void
2635on_enterleave_call (pTHX_ SV *cb)
2636{
2637 dSP;
2638
2639 PUSHSTACK;
2640
2641 PUSHMARK (SP);
2642 PUTBACK;
2643 call_sv (cb, G_VOID | G_DISCARD);
2644 SPAGAIN;
2645
2646 POPSTACK;
2647}
2648
2649static SV *
2650coro_avp_pop_and_free (pTHX_ AV **avp)
2651{
2652 AV *av = *avp;
2653 SV *res = av_pop (av);
2654
2655 if (AvFILLp (av) < 0)
2656 {
2657 *avp = 0;
2658 SvREFCNT_dec (av);
2659 }
2660
2661 return res;
2662}
2663
2664static void
2665coro_pop_on_enter (pTHX_ void *coro)
2666{
2667 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2668 SvREFCNT_dec (cb);
2669}
2670
2671static void
2672coro_pop_on_leave (pTHX_ void *coro)
2673{
2674 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2675 on_enterleave_call (aTHX_ sv_2mortal (cb));
2263} 2676}
2264 2677
2265/*****************************************************************************/ 2678/*****************************************************************************/
2266/* PerlIO::cede */ 2679/* PerlIO::cede */
2267 2680
… …
2341/* Coro::Semaphore & Coro::Signal */ 2754/* Coro::Semaphore & Coro::Signal */
2342 2755
2343static SV * 2756static SV *
2344coro_waitarray_new (pTHX_ int count) 2757coro_waitarray_new (pTHX_ int count)
2345{ 2758{
2346 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2759 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2347 AV *av = newAV (); 2760 AV *av = newAV ();
2348 SV **ary; 2761 SV **ary;
2349 2762
2350 /* unfortunately, building manually saves memory */ 2763 /* unfortunately, building manually saves memory */
2351 Newx (ary, 2, SV *); 2764 Newx (ary, 2, SV *);
2352 AvALLOC (av) = ary; 2765 AvALLOC (av) = ary;
2766#if PERL_VERSION_ATLEAST (5,10,0)
2353 /*AvARRAY (av) = ary;*/ 2767 AvARRAY (av) = ary;
2768#else
2354 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2769 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2770 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2771 SvPVX ((SV *)av) = (char *)ary;
2772#endif
2355 AvMAX (av) = 1; 2773 AvMAX (av) = 1;
2356 AvFILLp (av) = 0; 2774 AvFILLp (av) = 0;
2357 ary [0] = newSViv (count); 2775 ary [0] = newSViv (count);
2358 2776
2359 return newRV_noinc ((SV *)av); 2777 return newRV_noinc ((SV *)av);
… …
2397 SvREFCNT_dec (cb); 2815 SvREFCNT_dec (cb);
2398 } 2816 }
2399} 2817}
2400 2818
2401static void 2819static void
2402coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2820coro_semaphore_destroy (pTHX_ struct coro *coro)
2403{ 2821{
2404 /* call $sem->adjust (0) to possibly wake up some other waiters */ 2822 /* call $sem->adjust (0) to possibly wake up some other waiters */
2405 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0); 2823 coro_semaphore_adjust (aTHX_ (AV *)coro->slf_frame.data, 0);
2406} 2824}
2407 2825
… …
2414 /* if we are about to throw, don't actually acquire the lock, just throw */ 2832 /* if we are about to throw, don't actually acquire the lock, just throw */
2415 if (CORO_THROW) 2833 if (CORO_THROW)
2416 return 0; 2834 return 0;
2417 else if (SvIVX (count_sv) > 0) 2835 else if (SvIVX (count_sv) > 0)
2418 { 2836 {
2419 SvSTATE_current->on_destroy = 0; 2837 frame->destroy = 0;
2420 2838
2421 if (acquire) 2839 if (acquire)
2422 SvIVX (count_sv) = SvIVX (count_sv) - 1; 2840 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2423 else 2841 else
2424 coro_semaphore_adjust (aTHX_ av, 0); 2842 coro_semaphore_adjust (aTHX_ av, 0);
… …
2467 { 2885 {
2468 av_push (av, SvREFCNT_inc (SvRV (coro_current))); 2886 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2469 2887
2470 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av)); 2888 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2471 frame->prepare = prepare_schedule; 2889 frame->prepare = prepare_schedule;
2472
2473 /* to avoid race conditions when a woken-up coro gets terminated */ 2890 /* to avoid race conditions when a woken-up coro gets terminated */
2474 /* we arrange for a temporary on_destroy that calls adjust (0) */ 2891 /* we arrange for a temporary on_destroy that calls adjust (0) */
2475 SvSTATE_current->on_destroy = coro_semaphore_on_destroy; 2892 frame->destroy = coro_semaphore_destroy;
2476 } 2893 }
2477} 2894}
2478 2895
2479static void 2896static void
2480slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2897slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
… …
2488{ 2905{
2489 if (items >= 2) 2906 if (items >= 2)
2490 { 2907 {
2491 /* callback form */ 2908 /* callback form */
2492 AV *av = (AV *)SvRV (arg [0]); 2909 AV *av = (AV *)SvRV (arg [0]);
2493 CV *cb_cv = coro_sv_2cv (aTHX_ arg [1]); 2910 SV *cb_cv = s_get_cv_croak (arg [1]);
2494 2911
2495 av_push (av, (SV *)SvREFCNT_inc_NN (cb_cv)); 2912 av_push (av, SvREFCNT_inc_NN (cb_cv));
2496 2913
2497 if (SvIVX (AvARRAY (av)[0]) > 0) 2914 if (SvIVX (AvARRAY (av)[0]) > 0)
2498 coro_semaphore_adjust (aTHX_ av, 0); 2915 coro_semaphore_adjust (aTHX_ av, 0);
2499 2916
2500 frame->prepare = prepare_nop; 2917 frame->prepare = prepare_nop;
… …
2524 AvARRAY (av)[0] = AvARRAY (av)[1]; 2941 AvARRAY (av)[0] = AvARRAY (av)[1];
2525 AvARRAY (av)[1] = cb; 2942 AvARRAY (av)[1] = cb;
2526 2943
2527 cb = av_shift (av); 2944 cb = av_shift (av);
2528 2945
2946 if (SvTYPE (cb) == SVt_PVCV)
2947 {
2948 dSP;
2949 PUSHMARK (SP);
2950 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2951 PUTBACK;
2952 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2953 }
2954 else
2955 {
2529 api_ready (aTHX_ cb); 2956 api_ready (aTHX_ cb);
2530 sv_setiv (cb, 0); /* signal waiter */ 2957 sv_setiv (cb, 0); /* signal waiter */
2958 }
2959
2531 SvREFCNT_dec (cb); 2960 SvREFCNT_dec (cb);
2532 2961
2533 --count; 2962 --count;
2534 } 2963 }
2535} 2964}
… …
2544static void 2973static void
2545slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2974slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2546{ 2975{
2547 AV *av = (AV *)SvRV (arg [0]); 2976 AV *av = (AV *)SvRV (arg [0]);
2548 2977
2978 if (items >= 2)
2979 {
2980 SV *cb_cv = s_get_cv_croak (arg [1]);
2981 av_push (av, SvREFCNT_inc_NN (cb_cv));
2982
2549 if (SvIVX (AvARRAY (av)[0])) 2983 if (SvIVX (AvARRAY (av)[0]))
2984 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2985
2986 frame->prepare = prepare_nop;
2987 frame->check = slf_check_nop;
2988 }
2989 else if (SvIVX (AvARRAY (av)[0]))
2550 { 2990 {
2551 SvIVX (AvARRAY (av)[0]) = 0; 2991 SvIVX (AvARRAY (av)[0]) = 0;
2552 frame->prepare = prepare_nop; 2992 frame->prepare = prepare_nop;
2553 frame->check = slf_check_nop; 2993 frame->check = slf_check_nop;
2554 } 2994 }
2555 else 2995 else
2556 { 2996 {
2557 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2997 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2558 2998
2559 av_push (av, waiter); 2999 av_push (av, waiter);
2560 3000
2561 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 3001 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2562 frame->prepare = prepare_schedule; 3002 frame->prepare = prepare_schedule;
… …
2580 3020
2581static void 3021static void
2582coro_aio_callback (pTHX_ CV *cv) 3022coro_aio_callback (pTHX_ CV *cv)
2583{ 3023{
2584 dXSARGS; 3024 dXSARGS;
2585 AV *state = (AV *)GENSUB_ARG; 3025 AV *state = (AV *)S_GENSUB_ARG;
2586 SV *coro = av_pop (state); 3026 SV *coro = av_pop (state);
2587 SV *data_sv = newSV (sizeof (struct io_state)); 3027 SV *data_sv = newSV (sizeof (struct io_state));
2588 3028
2589 av_extend (state, items - 1); 3029 av_extend (state, items - 1);
2590 3030
… …
2704 3144
2705 for (i = 0; i < items; ++i) 3145 for (i = 0; i < items; ++i)
2706 PUSHs (arg [i]); 3146 PUSHs (arg [i]);
2707 3147
2708 /* now push the callback closure */ 3148 /* now push the callback closure */
2709 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 3149 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2710 3150
2711 /* now call the AIO function - we assume our request is uncancelable */ 3151 /* now call the AIO function - we assume our request is uncancelable */
2712 PUTBACK; 3152 PUTBACK;
2713 call_sv ((SV *)req, G_VOID | G_DISCARD); 3153 call_sv ((SV *)req, G_VOID | G_DISCARD);
2714 } 3154 }
2715 3155
2716 /* now that the requets is going, we loop toll we have a result */ 3156 /* now that the request is going, we loop till we have a result */
2717 frame->data = (void *)state; 3157 frame->data = (void *)state;
2718 frame->prepare = prepare_schedule; 3158 frame->prepare = prepare_schedule;
2719 frame->check = slf_check_aio_req; 3159 frame->check = slf_check_aio_req;
2720} 3160}
2721 3161
… …
2732/*****************************************************************************/ 3172/*****************************************************************************/
2733 3173
2734#if CORO_CLONE 3174#if CORO_CLONE
2735# include "clone.c" 3175# include "clone.c"
2736#endif 3176#endif
3177
3178/*****************************************************************************/
3179
3180static SV *
3181coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3182{
3183 SV *coro_sv;
3184 struct coro *coro;
3185 MAGIC *mg;
3186 HV *hv;
3187 SV *cb;
3188 int i;
3189
3190 if (argc > 0)
3191 {
3192 cb = s_get_cv_croak (argv [0]);
3193
3194 if (!is_coro)
3195 {
3196 if (CvISXSUB (cb))
3197 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3198
3199 if (!CvROOT (cb))
3200 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3201 }
3202 }
3203
3204 Newz (0, coro, 1, struct coro);
3205 coro->args = newAV ();
3206 coro->flags = CF_NEW;
3207
3208 if (coro_first) coro_first->prev = coro;
3209 coro->next = coro_first;
3210 coro_first = coro;
3211
3212 coro->hv = hv = newHV ();
3213 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3214 mg->mg_flags |= MGf_DUP;
3215 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3216
3217 if (argc > 0)
3218 {
3219 av_extend (coro->args, argc + is_coro - 1);
3220
3221 if (is_coro)
3222 {
3223 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3224 cb = (SV *)cv_coro_run;
3225 }
3226
3227 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3228
3229 for (i = 1; i < argc; i++)
3230 av_push (coro->args, newSVsv (argv [i]));
3231 }
3232
3233 return coro_sv;
3234}
2737 3235
2738MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3236MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2739 3237
2740PROTOTYPES: DISABLE 3238PROTOTYPES: DISABLE
2741 3239
… …
2746 coro_thx = PERL_GET_CONTEXT; 3244 coro_thx = PERL_GET_CONTEXT;
2747# endif 3245# endif
2748#endif 3246#endif
2749 BOOT_PAGESIZE; 3247 BOOT_PAGESIZE;
2750 3248
3249 cctx_current = cctx_new_empty ();
3250
2751 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3251 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2752 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3252 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2753 3253
2754 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3254 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; 3255 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2792 coroapi.prepare_nop = prepare_nop; 3292 coroapi.prepare_nop = prepare_nop;
2793 coroapi.prepare_schedule = prepare_schedule; 3293 coroapi.prepare_schedule = prepare_schedule;
2794 coroapi.prepare_cede = prepare_cede; 3294 coroapi.prepare_cede = prepare_cede;
2795 coroapi.prepare_cede_notself = prepare_cede_notself; 3295 coroapi.prepare_cede_notself = prepare_cede_notself;
2796 3296
2797 { 3297 time_init (aTHX);
2798 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2799 3298
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)); 3299 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2807} 3300}
2808 3301
2809SV * 3302SV *
2810new (char *klass, ...) 3303new (SV *klass, ...)
2811 ALIAS: 3304 ALIAS:
2812 Coro::new = 1 3305 Coro::new = 1
2813 CODE: 3306 CODE:
2814{ 3307 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2815 struct coro *coro; 3308 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 3309 RETVAL
2866 3310
2867void 3311void
2868transfer (...) 3312transfer (...)
2869 PROTOTYPE: $$ 3313 PROTOTYPE: $$
2870 CODE: 3314 CODE:
2871 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3315 CORO_EXECUTE_SLF_XS (slf_init_transfer);
2872 3316
2873bool
2874_destroy (SV *coro_sv)
2875 CODE:
2876 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
2877 OUTPUT:
2878 RETVAL
2879
2880void 3317void
2881_exit (int code) 3318_exit (int code)
2882 PROTOTYPE: $ 3319 PROTOTYPE: $
2883 CODE: 3320 CODE:
2884 _exit (code); 3321 _exit (code);
2885 3322
2886#if CORO_CLONE
2887
2888SV * 3323SV *
2889clone (Coro::State coro) 3324clone (Coro::State coro)
2890 CODE: 3325 CODE:
2891{ 3326{
3327#if CORO_CLONE
2892 struct coro *ncoro = coro_clone (coro); 3328 struct coro *ncoro = coro_clone (aTHX_ coro);
2893 MAGIC *mg; 3329 MAGIC *mg;
2894 /* TODO: too much duplication */ 3330 /* TODO: too much duplication */
2895 ncoro->hv = newHV (); 3331 ncoro->hv = newHV ();
2896 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3332 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2897 mg->mg_flags |= MGf_DUP; 3333 mg->mg_flags |= MGf_DUP;
2898 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv)); 3334 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3335#else
3336 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3337#endif
2899} 3338}
2900 OUTPUT: 3339 OUTPUT:
2901 RETVAL 3340 RETVAL
2902
2903#endif
2904 3341
2905int 3342int
2906cctx_stacksize (int new_stacksize = 0) 3343cctx_stacksize (int new_stacksize = 0)
2907 PROTOTYPE: ;$ 3344 PROTOTYPE: ;$
2908 CODE: 3345 CODE:
… …
2958 eval = 1 3395 eval = 1
2959 CODE: 3396 CODE:
2960{ 3397{
2961 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3398 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2962 { 3399 {
2963 struct coro temp; 3400 struct coro *current = SvSTATE_current;
3401 struct CoroSLF slf_save;
2964 3402
2965 if (!(coro->flags & CF_RUNNING)) 3403 if (current != coro)
2966 { 3404 {
2967 PUTBACK; 3405 PUTBACK;
2968 save_perl (aTHX_ &temp); 3406 save_perl (aTHX_ current);
2969 load_perl (aTHX_ coro); 3407 load_perl (aTHX_ coro);
3408 /* the coro is most likely in an active SLF call.
3409 * while not strictly required (the code we execute is
3410 * not allowed to call any SLF functions), it's cleaner
3411 * to reinitialise the slf_frame and restore it later.
3412 * This might one day allow us to actually do SLF calls
3413 * from code executed here.
3414 */
3415 slf_save = slf_frame;
3416 slf_frame.prepare = 0;
3417 SPAGAIN;
2970 } 3418 }
2971 3419
2972 {
2973 dSP;
2974 ENTER;
2975 SAVETMPS;
2976 PUTBACK;
2977 PUSHSTACK; 3420 PUSHSTACK;
3421
2978 PUSHMARK (SP); 3422 PUSHMARK (SP);
3423 PUTBACK;
2979 3424
2980 if (ix) 3425 if (ix)
2981 eval_sv (coderef, 0); 3426 eval_sv (coderef, 0);
2982 else 3427 else
2983 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3428 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2984 3429
2985 POPSTACK; 3430 POPSTACK;
2986 SPAGAIN; 3431 SPAGAIN;
2987 FREETMPS;
2988 LEAVE;
2989 PUTBACK;
2990 }
2991 3432
2992 if (!(coro->flags & CF_RUNNING)) 3433 if (current != coro)
2993 { 3434 {
3435 PUTBACK;
3436 slf_frame = slf_save;
2994 save_perl (aTHX_ coro); 3437 save_perl (aTHX_ coro);
2995 load_perl (aTHX_ &temp); 3438 load_perl (aTHX_ current);
2996 SPAGAIN; 3439 SPAGAIN;
2997 } 3440 }
2998 } 3441 }
2999} 3442}
3000 3443
… …
3004 ALIAS: 3447 ALIAS:
3005 is_ready = CF_READY 3448 is_ready = CF_READY
3006 is_running = CF_RUNNING 3449 is_running = CF_RUNNING
3007 is_new = CF_NEW 3450 is_new = CF_NEW
3008 is_destroyed = CF_DESTROYED 3451 is_destroyed = CF_DESTROYED
3452 is_suspended = CF_SUSPENDED
3009 CODE: 3453 CODE:
3010 RETVAL = boolSV (coro->flags & ix); 3454 RETVAL = boolSV (coro->flags & ix);
3011 OUTPUT: 3455 OUTPUT:
3012 RETVAL 3456 RETVAL
3013 3457
3014void 3458void
3015throw (Coro::State self, SV *throw = &PL_sv_undef) 3459throw (Coro::State self, SV *exception = &PL_sv_undef)
3016 PROTOTYPE: $;$ 3460 PROTOTYPE: $;$
3017 CODE: 3461 CODE:
3018{ 3462{
3019 struct coro *current = SvSTATE_current; 3463 struct coro *current = SvSTATE_current;
3020 SV **throwp = self == current ? &CORO_THROW : &self->except; 3464 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3021 SvREFCNT_dec (*throwp); 3465 SvREFCNT_dec (*exceptionp);
3022 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3466 SvGETMAGIC (exception);
3467 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3023} 3468}
3024 3469
3025void 3470void
3026api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3471api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3027 PROTOTYPE: $;$ 3472 PROTOTYPE: $;$
… …
3029 3474
3030SV * 3475SV *
3031has_cctx (Coro::State coro) 3476has_cctx (Coro::State coro)
3032 PROTOTYPE: $ 3477 PROTOTYPE: $
3033 CODE: 3478 CODE:
3034 RETVAL = boolSV (!!coro->cctx); 3479 /* maybe manage the running flag differently */
3480 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
3035 OUTPUT: 3481 OUTPUT:
3036 RETVAL 3482 RETVAL
3037 3483
3038int 3484int
3039is_traced (Coro::State coro) 3485is_traced (Coro::State coro)
… …
3059 3505
3060void 3506void
3061force_cctx () 3507force_cctx ()
3062 PROTOTYPE: 3508 PROTOTYPE:
3063 CODE: 3509 CODE:
3064 SvSTATE_current->cctx->idle_sp = 0; 3510 cctx_current->idle_sp = 0;
3065 3511
3066void 3512void
3067swap_defsv (Coro::State self) 3513swap_defsv (Coro::State self)
3068 PROTOTYPE: $ 3514 PROTOTYPE: $
3069 ALIAS: 3515 ALIAS:
… …
3077 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3523 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3078 3524
3079 SV *tmp = *src; *src = *dst; *dst = tmp; 3525 SV *tmp = *src; *src = *dst; *dst = tmp;
3080 } 3526 }
3081 3527
3528void
3529cancel (Coro::State self)
3530 CODE:
3531 coro_state_destroy (aTHX_ self);
3532
3533SV *
3534enable_times (int enabled = enable_times)
3535 CODE:
3536{
3537 RETVAL = boolSV (enable_times);
3538
3539 if (enabled != enable_times)
3540 {
3541 enable_times = enabled;
3542
3543 coro_times_update ();
3544 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3545 }
3546}
3547 OUTPUT:
3548 RETVAL
3549
3550void
3551times (Coro::State self)
3552 PPCODE:
3553{
3554 struct coro *current = SvSTATE (coro_current);
3555
3556 if (expect_false (current == self))
3557 {
3558 coro_times_update ();
3559 coro_times_add (SvSTATE (coro_current));
3560 }
3561
3562 EXTEND (SP, 2);
3563 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3564 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3565
3566 if (expect_false (current == self))
3567 coro_times_sub (SvSTATE (coro_current));
3568}
3569
3570void
3571swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3572 CODE:
3573{
3574 struct coro *current = SvSTATE_current;
3575
3576 if (current == coro)
3577 SWAP_SVS (current);
3578
3579 if (!coro->swap_sv)
3580 coro->swap_sv = newAV ();
3581
3582 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3583 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3584
3585 if (current == coro)
3586 SWAP_SVS (current);
3587}
3588
3082 3589
3083MODULE = Coro::State PACKAGE = Coro 3590MODULE = Coro::State PACKAGE = Coro
3084 3591
3085BOOT: 3592BOOT:
3086{ 3593{
3087 int i;
3088
3089 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3594 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3090 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3595 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3091 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3596 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); 3597 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); 3598 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3095 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3599 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3096 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3600 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3601 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3097 3602
3098 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3603 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); 3604 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); 3605 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); 3606 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3102 3607
3103 coro_stash = gv_stashpv ("Coro", TRUE); 3608 coro_stash = gv_stashpv ("Coro", TRUE);
3104 3609
3105 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3610 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3106 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3611 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3107 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3612 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
3108 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3613 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
3109 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3614 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
3110 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3615 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 3616
3115 { 3617 {
3116 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3618 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3117 3619
3118 coroapi.schedule = api_schedule; 3620 coroapi.schedule = api_schedule;
… …
3128 sv_setiv (sv, (IV)&coroapi); 3630 sv_setiv (sv, (IV)&coroapi);
3129 SvREADONLY_on (sv); 3631 SvREADONLY_on (sv);
3130 } 3632 }
3131} 3633}
3132 3634
3635SV *
3636async (...)
3637 PROTOTYPE: &@
3638 CODE:
3639 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3640 api_ready (aTHX_ RETVAL);
3641 OUTPUT:
3642 RETVAL
3643
3644void
3645_destroy (Coro::State coro)
3646 CODE:
3647 /* used by the manager thread */
3648 coro_state_destroy (aTHX_ coro);
3649 coro_call_on_destroy (aTHX_ coro);
3650
3133void 3651void
3134terminate (...) 3652terminate (...)
3135 CODE: 3653 CODE:
3136 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3654 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3137 3655
3138void 3656void
3657cancel (...)
3658 CODE:
3659 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3660
3661int
3662safe_cancel (Coro::State self, ...)
3663 C_ARGS: aTHX_ self, &ST (1), items - 1
3664
3665void
3139schedule (...) 3666schedule (...)
3140 CODE: 3667 CODE:
3141 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3668 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3142 3669
3143void 3670void
… …
3157 3684
3158void 3685void
3159cede_notself (...) 3686cede_notself (...)
3160 CODE: 3687 CODE:
3161 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3688 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 3689
3169void 3690void
3170_set_current (SV *current) 3691_set_current (SV *current)
3171 PROTOTYPE: $ 3692 PROTOTYPE: $
3172 CODE: 3693 CODE:
… …
3176void 3697void
3177_set_readyhook (SV *hook) 3698_set_readyhook (SV *hook)
3178 PROTOTYPE: $ 3699 PROTOTYPE: $
3179 CODE: 3700 CODE:
3180 SvREFCNT_dec (coro_readyhook); 3701 SvREFCNT_dec (coro_readyhook);
3702 SvGETMAGIC (hook);
3703 if (SvOK (hook))
3704 {
3181 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3705 coro_readyhook = newSVsv (hook);
3706 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3707 }
3708 else
3709 {
3710 coro_readyhook = 0;
3711 CORO_READYHOOK = 0;
3712 }
3182 3713
3183int 3714int
3184prio (Coro::State coro, int newprio = 0) 3715prio (Coro::State coro, int newprio = 0)
3185 PROTOTYPE: $;$ 3716 PROTOTYPE: $;$
3186 ALIAS: 3717 ALIAS:
… …
3192 if (items > 1) 3723 if (items > 1)
3193 { 3724 {
3194 if (ix) 3725 if (ix)
3195 newprio = coro->prio - newprio; 3726 newprio = coro->prio - newprio;
3196 3727
3197 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3728 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
3198 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3729 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
3199 3730
3200 coro->prio = newprio; 3731 coro->prio = newprio;
3201 } 3732 }
3202} 3733}
3203 OUTPUT: 3734 OUTPUT:
… …
3218 RETVAL = coro_nready; 3749 RETVAL = coro_nready;
3219 OUTPUT: 3750 OUTPUT:
3220 RETVAL 3751 RETVAL
3221 3752
3222void 3753void
3754suspend (Coro::State self)
3755 PROTOTYPE: $
3756 CODE:
3757 self->flags |= CF_SUSPENDED;
3758
3759void
3760resume (Coro::State self)
3761 PROTOTYPE: $
3762 CODE:
3763 self->flags &= ~CF_SUSPENDED;
3764
3765void
3223_pool_handler (...) 3766_pool_handler (...)
3224 CODE: 3767 CODE:
3225 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3768 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3226 3769
3227void 3770void
… …
3238 for (i = 1; i < items; ++i) 3781 for (i = 1; i < items; ++i)
3239 av_push (av, SvREFCNT_inc_NN (ST (i))); 3782 av_push (av, SvREFCNT_inc_NN (ST (i)));
3240 3783
3241 if ((SV *)hv == &PL_sv_undef) 3784 if ((SV *)hv == &PL_sv_undef)
3242 { 3785 {
3243 PUSHMARK (SP); 3786 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)); 3787 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3788 SvREFCNT_dec (sv);
3252 } 3789 }
3253 3790
3254 { 3791 {
3255 struct coro *coro = SvSTATE_hv (hv); 3792 struct coro *coro = SvSTATE_hv (hv);
3256 3793
… …
3280rouse_wait (...) 3817rouse_wait (...)
3281 PROTOTYPE: ;$ 3818 PROTOTYPE: ;$
3282 PPCODE: 3819 PPCODE:
3283 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3820 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3284 3821
3822void
3823on_enter (SV *block)
3824 ALIAS:
3825 on_leave = 1
3826 PROTOTYPE: &
3827 CODE:
3828{
3829 struct coro *coro = SvSTATE_current;
3830 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3831
3832 block = s_get_cv_croak (block);
3833
3834 if (!*avp)
3835 *avp = newAV ();
3836
3837 av_push (*avp, SvREFCNT_inc (block));
3838
3839 if (!ix)
3840 on_enterleave_call (aTHX_ block);
3841
3842 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3843 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3844 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3845}
3846
3285 3847
3286MODULE = Coro::State PACKAGE = PerlIO::cede 3848MODULE = Coro::State PACKAGE = PerlIO::cede
3287 3849
3288BOOT: 3850BOOT:
3289 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3851 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3292MODULE = Coro::State PACKAGE = Coro::Semaphore 3854MODULE = Coro::State PACKAGE = Coro::Semaphore
3293 3855
3294SV * 3856SV *
3295new (SV *klass, SV *count = 0) 3857new (SV *klass, SV *count = 0)
3296 CODE: 3858 CODE:
3859{
3860 int semcnt = 1;
3861
3862 if (count)
3863 {
3864 SvGETMAGIC (count);
3865
3866 if (SvOK (count))
3867 semcnt = SvIV (count);
3868 }
3869
3297 RETVAL = sv_bless ( 3870 RETVAL = sv_bless (
3298 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3871 coro_waitarray_new (aTHX_ semcnt),
3299 GvSTASH (CvGV (cv)) 3872 GvSTASH (CvGV (cv))
3300 ); 3873 );
3874}
3301 OUTPUT: 3875 OUTPUT:
3302 RETVAL 3876 RETVAL
3303 3877
3304# helper for Coro::Channel 3878# helper for Coro::Channel and others
3305SV * 3879SV *
3306_alloc (int count) 3880_alloc (int count)
3307 CODE: 3881 CODE:
3308 RETVAL = coro_waitarray_new (aTHX_ count); 3882 RETVAL = coro_waitarray_new (aTHX_ count);
3309 OUTPUT: 3883 OUTPUT:
… …
3367 for (i = 1; i <= wcount; ++i) 3941 for (i = 1; i <= wcount; ++i)
3368 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3942 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3369 } 3943 }
3370} 3944}
3371 3945
3946MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3947
3948void
3949_may_delete (SV *sem, int count, int extra_refs)
3950 PPCODE:
3951{
3952 AV *av = (AV *)SvRV (sem);
3953
3954 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3955 && AvFILLp (av) == 0 /* no waiters, just count */
3956 && SvIV (AvARRAY (av)[0]) == count)
3957 XSRETURN_YES;
3958
3959 XSRETURN_NO;
3960}
3961
3372MODULE = Coro::State PACKAGE = Coro::Signal 3962MODULE = Coro::State PACKAGE = Coro::Signal
3373 3963
3374SV * 3964SV *
3375new (SV *klass) 3965new (SV *klass)
3376 CODE: 3966 CODE:
… …
3447 4037
3448void 4038void
3449_register (char *target, char *proto, SV *req) 4039_register (char *target, char *proto, SV *req)
3450 CODE: 4040 CODE:
3451{ 4041{
3452 CV *req_cv = coro_sv_2cv (aTHX_ req); 4042 SV *req_cv = s_get_cv_croak (req);
3453 /* newXSproto doesn't return the CV on 5.8 */ 4043 /* newXSproto doesn't return the CV on 5.8 */
3454 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 4044 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3455 sv_setpv ((SV *)slf_cv, proto); 4045 sv_setpv ((SV *)slf_cv, proto);
3456 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 4046 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3457} 4047}
3458 4048
4049MODULE = Coro::State PACKAGE = Coro::Select
4050
4051void
4052patch_pp_sselect ()
4053 CODE:
4054 if (!coro_old_pp_sselect)
4055 {
4056 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
4057 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
4058 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
4059 }
4060
4061void
4062unpatch_pp_sselect ()
4063 CODE:
4064 if (coro_old_pp_sselect)
4065 {
4066 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
4067 coro_old_pp_sselect = 0;
4068 }
4069

Diff Legend

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