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.322 by root, Sat Nov 22 05:13:34 2008 UTC vs.
Revision 1.402 by root, Sun May 22 13:07:23 2011 UTC

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

Diff Legend

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