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.303 by root, Wed Nov 19 05:52:42 2008 UTC vs.
Revision 1.382 by root, Thu Feb 10 08:06:27 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>
21
22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
16 25
17#ifdef WIN32 26#ifdef WIN32
18# undef setjmp 27# undef setjmp
19# undef longjmp 28# undef longjmp
20# undef _exit 29# undef _exit
… …
51#endif 60#endif
52 61
53/* the maximum number of idle cctx that will be pooled */ 62/* the maximum number of idle cctx that will be pooled */
54static int cctx_max_idle = 4; 63static int cctx_max_idle = 4;
55 64
56#define PERL_VERSION_ATLEAST(a,b,c) \
57 (PERL_REVISION > (a) \
58 || (PERL_REVISION == (a) \
59 && (PERL_VERSION > (b) \
60 || (PERL_VERSION == (b) && PERLSUBVERSION >= (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
104/* 5.8.7 */
105#ifndef SvRV_set
106# define SvRV_set(s,v) SvRV(s) = (v)
107#endif
108
109#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 65#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
110# undef CORO_STACKGUARD 66# undef CORO_STACKGUARD
111#endif 67#endif
112 68
113#ifndef CORO_STACKGUARD 69#ifndef CORO_STACKGUARD
… …
127#else 83#else
128# define dSTACKLEVEL volatile void *stacklevel 84# define dSTACKLEVEL volatile void *stacklevel
129# define STACKLEVEL ((void *)&stacklevel) 85# define STACKLEVEL ((void *)&stacklevel)
130#endif 86#endif
131 87
132#define IN_DESTRUCT (PL_main_cv == Nullcv) 88#define IN_DESTRUCT PL_dirty
133 89
134#if __GNUC__ >= 3 90#if __GNUC__ >= 3
135# define attribute(x) __attribute__(x) 91# define attribute(x) __attribute__(x)
136# define expect(expr,value) __builtin_expect ((expr),(value)) 92# define expect(expr,value) __builtin_expect ((expr), (value))
137# define INLINE static inline 93# define INLINE static inline
138#else 94#else
139# define attribute(x) 95# define attribute(x)
140# define expect(expr,value) (expr) 96# define expect(expr,value) (expr)
141# define INLINE static 97# define INLINE static
… …
153# if CORO_PTHREAD 109# if CORO_PTHREAD
154static void *coro_thx; 110static void *coro_thx;
155# endif 111# endif
156#endif 112#endif
157 113
114#ifdef __linux
115# include <time.h> /* for timespec */
116# include <syscall.h> /* for SYS_* */
117# ifdef SYS_clock_gettime
118# define coro_clock_gettime(id, ts) syscall (SYS_clock_gettime, (id), (ts))
119# define CORO_CLOCK_MONOTONIC 1
120# define CORO_CLOCK_THREAD_CPUTIME_ID 3
121# endif
122#endif
123
158static double (*nvtime)(); /* so why doesn't it take void? */ 124static double (*nvtime)(); /* so why doesn't it take void? */
125static void (*u2time)(pTHX_ UV ret[2]);
159 126
160/* we hijack an hopefully unused CV flag for our purposes */ 127/* we hijack an hopefully unused CV flag for our purposes */
161#define CVf_SLF 0x4000 128#define CVf_SLF 0x4000
162static OP *pp_slf (pTHX); 129static OP *pp_slf (pTHX);
163 130
… …
167static AV *main_mainstack; /* used to differentiate between $main and others */ 134static AV *main_mainstack; /* used to differentiate between $main and others */
168static JMPENV *main_top_env; 135static JMPENV *main_top_env;
169static HV *coro_state_stash, *coro_stash; 136static HV *coro_state_stash, *coro_stash;
170static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */ 137static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
171 138
139static AV *av_destroy; /* destruction queue */
140static SV *sv_manager; /* the manager coro */
141static SV *sv_idle; /* $Coro::idle */
142
172static GV *irsgv; /* $/ */ 143static GV *irsgv; /* $/ */
173static GV *stdoutgv; /* *STDOUT */ 144static GV *stdoutgv; /* *STDOUT */
174static SV *rv_diehook; 145static SV *rv_diehook;
175static SV *rv_warnhook; 146static SV *rv_warnhook;
176static HV *hv_sig; /* %SIG */ 147static HV *hv_sig; /* %SIG */
177 148
178/* async_pool helper stuff */ 149/* async_pool helper stuff */
179static SV *sv_pool_rss; 150static SV *sv_pool_rss;
180static SV *sv_pool_size; 151static SV *sv_pool_size;
152static SV *sv_async_pool_idle; /* description string */
181static AV *av_async_pool; 153static AV *av_async_pool; /* idle pool */
154static SV *sv_Coro; /* class string */
155static CV *cv_pool_handler;
182 156
183/* Coro::AnyEvent */ 157/* Coro::AnyEvent */
184static SV *sv_activity; 158static SV *sv_activity;
159
160/* enable processtime/realtime profiling */
161static char enable_times;
162typedef U32 coro_ts[2];
163static coro_ts time_real, time_cpu;
164static char times_valid;
185 165
186static struct coro_cctx *cctx_first; 166static struct coro_cctx *cctx_first;
187static int cctx_count, cctx_idle; 167static int cctx_count, cctx_idle;
188 168
189enum { 169enum {
… …
215 int valgrind_id; 195 int valgrind_id;
216#endif 196#endif
217 unsigned char flags; 197 unsigned char flags;
218} coro_cctx; 198} coro_cctx;
219 199
200coro_cctx *cctx_current; /* the currently running cctx */
201
202/*****************************************************************************/
203
220enum { 204enum {
221 CF_RUNNING = 0x0001, /* coroutine is running */ 205 CF_RUNNING = 0x0001, /* coroutine is running */
222 CF_READY = 0x0002, /* coroutine is ready */ 206 CF_READY = 0x0002, /* coroutine is ready */
223 CF_NEW = 0x0004, /* has never been switched to */ 207 CF_NEW = 0x0004, /* has never been switched to */
224 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 208 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
209 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
225}; 210};
226 211
227/* the structure where most of the perl state is stored, overlaid on the cxstack */ 212/* the structure where most of the perl state is stored, overlaid on the cxstack */
228typedef struct 213typedef struct
229{ 214{
230 SV *defsv; 215 SV *defsv;
231 AV *defav; 216 AV *defav;
232 SV *errsv; 217 SV *errsv;
233 SV *irsgv; 218 SV *irsgv;
219 HV *hinthv;
234#define VAR(name,type) type name; 220#define VAR(name,type) type name;
235# include "state.h" 221# include "state.h"
236#undef VAR 222#undef VAR
237} perl_slots; 223} perl_slots;
238 224
… …
241/* this is a structure representing a perl-level coroutine */ 227/* this is a structure representing a perl-level coroutine */
242struct coro { 228struct coro {
243 /* the C coroutine allocated to this perl coroutine, if any */ 229 /* the C coroutine allocated to this perl coroutine, if any */
244 coro_cctx *cctx; 230 coro_cctx *cctx;
245 231
232 /* ready queue */
233 struct coro *next_ready;
234
246 /* state data */ 235 /* state data */
247 struct CoroSLF slf_frame; /* saved slf frame */ 236 struct CoroSLF slf_frame; /* saved slf frame */
248 AV *mainstack; 237 AV *mainstack;
249 perl_slots *slot; /* basically the saved sp */ 238 perl_slots *slot; /* basically the saved sp */
250 239
240 CV *startcv; /* the CV to execute */
251 AV *args; /* data associated with this coroutine (initial args) */ 241 AV *args; /* data associated with this coroutine (initial args) */
252 int refcnt; /* coroutines are refcounted, yes */ 242 int refcnt; /* coroutines are refcounted, yes */
253 int flags; /* CF_ flags */ 243 int flags; /* CF_ flags */
254 HV *hv; /* the perl hash associated with this coro, if any */ 244 HV *hv; /* the perl hash associated with this coro, if any */
255 void (*on_destroy)(pTHX_ struct coro *coro); 245 void (*on_destroy)(pTHX_ struct coro *coro);
256 246
257 /* statistics */ 247 /* statistics */
258 int usecount; /* number of transfers to this coro */ 248 int usecount; /* number of transfers to this coro */
259 249
… …
262 SV *except; /* exception to be thrown */ 252 SV *except; /* exception to be thrown */
263 SV *rouse_cb; 253 SV *rouse_cb;
264 254
265 /* async_pool */ 255 /* async_pool */
266 SV *saved_deffh; 256 SV *saved_deffh;
257 SV *invoke_cb;
258 AV *invoke_av;
259
260 /* on_enter/on_leave */
261 AV *on_enter;
262 AV *on_leave;
263
264 /* swap_sv */
265 AV *swap_sv;
266
267 /* times */
268 coro_ts t_cpu, t_real;
267 269
268 /* linked list */ 270 /* linked list */
269 struct coro *next, *prev; 271 struct coro *next, *prev;
270}; 272};
271 273
… …
277/* the mainr easonw e don't support windows process emulation */ 279/* the mainr easonw e don't support windows process emulation */
278static struct CoroSLF slf_frame; /* the current slf frame */ 280static struct CoroSLF slf_frame; /* the current slf frame */
279 281
280/** Coro ********************************************************************/ 282/** Coro ********************************************************************/
281 283
282#define PRIO_MAX 3 284#define CORO_PRIO_MAX 3
283#define PRIO_HIGH 1 285#define CORO_PRIO_HIGH 1
284#define PRIO_NORMAL 0 286#define CORO_PRIO_NORMAL 0
285#define PRIO_LOW -1 287#define CORO_PRIO_LOW -1
286#define PRIO_IDLE -3 288#define CORO_PRIO_IDLE -3
287#define PRIO_MIN -4 289#define CORO_PRIO_MIN -4
288 290
289/* for Coro.pm */ 291/* for Coro.pm */
290static SV *coro_current; 292static SV *coro_current;
291static SV *coro_readyhook; 293static SV *coro_readyhook;
292static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 294static struct coro *coro_ready [CORO_PRIO_MAX - CORO_PRIO_MIN + 1][2]; /* head|tail */
295static CV *cv_coro_run, *cv_coro_terminate;
293static struct coro *coro_first; 296static struct coro *coro_first;
294#define coro_nready coroapi.nready 297#define coro_nready coroapi.nready
298
299/** Coro::Select ************************************************************/
300
301static OP *(*coro_old_pp_sselect) (pTHX);
302static SV *coro_select_select;
303
304/* horrible hack, but if it works... */
305static OP *
306coro_pp_sselect (pTHX)
307{
308 dSP;
309 PUSHMARK (SP - 4); /* fake argument list */
310 XPUSHs (coro_select_select);
311 PUTBACK;
312
313 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
314 PL_op->op_flags |= OPf_STACKED;
315 PL_op->op_private = 0;
316 return PL_ppaddr [OP_ENTERSUB](aTHX);
317}
295 318
296/** lowlevel stuff **********************************************************/ 319/** lowlevel stuff **********************************************************/
297 320
298static SV * 321static SV *
299coro_get_sv (pTHX_ const char *name, int create) 322coro_get_sv (pTHX_ const char *name, int create)
… …
323 get_hv (name, create); 346 get_hv (name, create);
324#endif 347#endif
325 return get_hv (name, create); 348 return get_hv (name, create);
326} 349}
327 350
351INLINE void
352coro_times_update ()
353{
354#ifdef coro_clock_gettime
355 struct timespec ts;
356
357 ts.tv_sec = ts.tv_nsec = 0;
358 coro_clock_gettime (CORO_CLOCK_THREAD_CPUTIME_ID, &ts);
359 time_cpu [0] = ts.tv_sec; time_cpu [1] = ts.tv_nsec;
360
361 ts.tv_sec = ts.tv_nsec = 0;
362 coro_clock_gettime (CORO_CLOCK_MONOTONIC, &ts);
363 time_real [0] = ts.tv_sec; time_real [1] = ts.tv_nsec;
364#else
365 dTHX;
366 UV tv[2];
367
368 u2time (aTHX_ tv);
369 time_real [0] = tv [0];
370 time_real [1] = tv [1] * 1000;
371#endif
372}
373
374INLINE void
375coro_times_add (struct coro *c)
376{
377 c->t_real [1] += time_real [1];
378 if (c->t_real [1] > 1000000000) { c->t_real [1] -= 1000000000; ++c->t_real [0]; }
379 c->t_real [0] += time_real [0];
380
381 c->t_cpu [1] += time_cpu [1];
382 if (c->t_cpu [1] > 1000000000) { c->t_cpu [1] -= 1000000000; ++c->t_cpu [0]; }
383 c->t_cpu [0] += time_cpu [0];
384}
385
386INLINE void
387coro_times_sub (struct coro *c)
388{
389 if (c->t_real [1] < time_real [1]) { c->t_real [1] += 1000000000; --c->t_real [0]; }
390 c->t_real [1] -= time_real [1];
391 c->t_real [0] -= time_real [0];
392
393 if (c->t_cpu [1] < time_cpu [1]) { c->t_cpu [1] += 1000000000; --c->t_cpu [0]; }
394 c->t_cpu [1] -= time_cpu [1];
395 c->t_cpu [0] -= time_cpu [0];
396}
397
398/*****************************************************************************/
399/* magic glue */
400
401#define CORO_MAGIC_type_cv 26
402#define CORO_MAGIC_type_state PERL_MAGIC_ext
403
404#define CORO_MAGIC_NN(sv, type) \
405 (expect_true (SvMAGIC (sv)->mg_type == type) \
406 ? SvMAGIC (sv) \
407 : mg_find (sv, type))
408
409#define CORO_MAGIC(sv, type) \
410 (expect_true (SvMAGIC (sv)) \
411 ? CORO_MAGIC_NN (sv, type) \
412 : 0)
413
414#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
415#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
416
417INLINE struct coro *
418SvSTATE_ (pTHX_ SV *coro)
419{
420 HV *stash;
421 MAGIC *mg;
422
423 if (SvROK (coro))
424 coro = SvRV (coro);
425
426 if (expect_false (SvTYPE (coro) != SVt_PVHV))
427 croak ("Coro::State object required");
428
429 stash = SvSTASH (coro);
430 if (expect_false (stash != coro_stash && stash != coro_state_stash))
431 {
432 /* very slow, but rare, check */
433 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
434 croak ("Coro::State object required");
435 }
436
437 mg = CORO_MAGIC_state (coro);
438 return (struct coro *)mg->mg_ptr;
439}
440
441#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
442
443/* faster than SvSTATE, but expects a coroutine hv */
444#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
445#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
446
447/*****************************************************************************/
448/* padlist management and caching */
449
328static AV * 450static AV *
329coro_clone_padlist (pTHX_ CV *cv) 451coro_derive_padlist (pTHX_ CV *cv)
330{ 452{
331 AV *padlist = CvPADLIST (cv); 453 AV *padlist = CvPADLIST (cv);
332 AV *newpadlist, *newpad; 454 AV *newpadlist, *newpad;
333 455
334 newpadlist = newAV (); 456 newpadlist = newAV ();
… …
339 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 461 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
340#endif 462#endif
341 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 463 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
342 --AvFILLp (padlist); 464 --AvFILLp (padlist);
343 465
344 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 466 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
345 av_store (newpadlist, 1, (SV *)newpad); 467 av_store (newpadlist, 1, (SV *)newpad);
346 468
347 return newpadlist; 469 return newpadlist;
348} 470}
349 471
350static void 472static void
351free_padlist (pTHX_ AV *padlist) 473free_padlist (pTHX_ AV *padlist)
352{ 474{
353 /* may be during global destruction */ 475 /* may be during global destruction */
354 if (SvREFCNT (padlist)) 476 if (!IN_DESTRUCT)
355 { 477 {
356 I32 i = AvFILLp (padlist); 478 I32 i = AvFILLp (padlist);
357 while (i >= 0) 479
480 while (i > 0) /* special-case index 0 */
358 { 481 {
359 SV **svp = av_fetch (padlist, i--, FALSE); 482 /* we try to be extra-careful here */
360 if (svp) 483 AV *av = (AV *)AvARRAY (padlist)[i--];
361 { 484 I32 j = AvFILLp (av);
362 SV *sv; 485
363 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 486 while (j >= 0)
487 SvREFCNT_dec (AvARRAY (av)[j--]);
488
489 AvFILLp (av) = -1;
364 SvREFCNT_dec (sv); 490 SvREFCNT_dec (av);
365
366 SvREFCNT_dec (*svp);
367 }
368 } 491 }
369 492
493 SvREFCNT_dec (AvARRAY (padlist)[0]);
494
495 AvFILLp (padlist) = -1;
370 SvREFCNT_dec ((SV*)padlist); 496 SvREFCNT_dec ((SV*)padlist);
371 } 497 }
372} 498}
373 499
374static int 500static int
375coro_cv_free (pTHX_ SV *sv, MAGIC *mg) 501coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
376{ 502{
377 AV *padlist; 503 AV *padlist;
378 AV *av = (AV *)mg->mg_obj; 504 AV *av = (AV *)mg->mg_obj;
505
506 /* perl manages to free our internal AV and _then_ call us */
507 if (IN_DESTRUCT)
508 return 0;
379 509
380 /* casting is fun. */ 510 /* casting is fun. */
381 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 511 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
382 free_padlist (aTHX_ padlist); 512 free_padlist (aTHX_ padlist);
383 513
384 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 514 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
385 515
386 return 0; 516 return 0;
387} 517}
388
389#define CORO_MAGIC_type_cv 26
390#define CORO_MAGIC_type_state PERL_MAGIC_ext
391 518
392static MGVTBL coro_cv_vtbl = { 519static MGVTBL coro_cv_vtbl = {
393 0, 0, 0, 0, 520 0, 0, 0, 0,
394 coro_cv_free 521 coro_cv_free
395}; 522};
396
397#define CORO_MAGIC_NN(sv, type) \
398 (expect_true (SvMAGIC (sv)->mg_type == type) \
399 ? SvMAGIC (sv) \
400 : mg_find (sv, type))
401
402#define CORO_MAGIC(sv, type) \
403 (expect_true (SvMAGIC (sv)) \
404 ? CORO_MAGIC_NN (sv, type) \
405 : 0)
406
407#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
408#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
409
410INLINE struct coro *
411SvSTATE_ (pTHX_ SV *coro)
412{
413 HV *stash;
414 MAGIC *mg;
415
416 if (SvROK (coro))
417 coro = SvRV (coro);
418
419 if (expect_false (SvTYPE (coro) != SVt_PVHV))
420 croak ("Coro::State object required");
421
422 stash = SvSTASH (coro);
423 if (expect_false (stash != coro_stash && stash != coro_state_stash))
424 {
425 /* very slow, but rare, check */
426 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
427 croak ("Coro::State object required");
428 }
429
430 mg = CORO_MAGIC_state (coro);
431 return (struct coro *)mg->mg_ptr;
432}
433
434#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
435
436/* faster than SvSTATE, but expects a coroutine hv */
437#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
438#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
439 523
440/* the next two functions merely cache the padlists */ 524/* the next two functions merely cache the padlists */
441static void 525static void
442get_padlist (pTHX_ CV *cv) 526get_padlist (pTHX_ CV *cv)
443{ 527{
… …
449 else 533 else
450 { 534 {
451#if CORO_PREFER_PERL_FUNCTIONS 535#if CORO_PREFER_PERL_FUNCTIONS
452 /* this is probably cleaner? but also slower! */ 536 /* this is probably cleaner? but also slower! */
453 /* in practise, it seems to be less stable */ 537 /* in practise, it seems to be less stable */
454 CV *cp = Perl_cv_clone (cv); 538 CV *cp = Perl_cv_clone (aTHX_ cv);
455 CvPADLIST (cv) = CvPADLIST (cp); 539 CvPADLIST (cv) = CvPADLIST (cp);
456 CvPADLIST (cp) = 0; 540 CvPADLIST (cp) = 0;
457 SvREFCNT_dec (cp); 541 SvREFCNT_dec (cp);
458#else 542#else
459 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 543 CvPADLIST (cv) = coro_derive_padlist (aTHX_ cv);
460#endif 544#endif
461 } 545 }
462} 546}
463 547
464static void 548static void
… …
471 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 555 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
472 556
473 av = (AV *)mg->mg_obj; 557 av = (AV *)mg->mg_obj;
474 558
475 if (expect_false (AvFILLp (av) >= AvMAX (av))) 559 if (expect_false (AvFILLp (av) >= AvMAX (av)))
476 av_extend (av, AvMAX (av) + 1); 560 av_extend (av, AvFILLp (av) + 1);
477 561
478 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 562 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
479} 563}
480 564
481/** load & save, init *******************************************************/ 565/** load & save, init *******************************************************/
566
567/* swap sv heads, at least logically */
568static void
569swap_svs (pTHX_ Coro__State c)
570{
571 int i;
572
573 for (i = 0; i <= AvFILLp (c->swap_sv); )
574 {
575 SV *a = AvARRAY (c->swap_sv)[i++];
576 SV *b = AvARRAY (c->swap_sv)[i++];
577
578 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
579 SV tmp;
580
581 /* swap sv_any */
582 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
583
584 /* swap sv_flags */
585 SvFLAGS (&tmp) = SvFLAGS (a);
586 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
587 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
588
589#if PERL_VERSION_ATLEAST (5,10,0)
590 /* perl 5.10 complicates this _quite_ a bit, but it also is
591 * is much faster, so no quarrels here. alternatively, we could
592 * sv_upgrade to avoid this.
593 */
594 {
595 /* swap sv_u */
596 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
597
598 /* if SvANY points to the head, we need to adjust the pointers,
599 * as the pointer for a still points to b, and maybe vice versa.
600 */
601 #define svany_in_head(type) \
602 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
603
604 if (svany_in_head (SvTYPE (a)))
605 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
606
607 if (svany_in_head (SvTYPE (b)))
608 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
609 }
610#endif
611 }
612}
613
614#define SWAP_SVS(coro) \
615 if (expect_false ((coro)->swap_sv)) \
616 swap_svs (aTHX_ (coro))
617
618static void
619on_enterleave_call (pTHX_ SV *cb);
482 620
483static void 621static void
484load_perl (pTHX_ Coro__State c) 622load_perl (pTHX_ Coro__State c)
485{ 623{
486 perl_slots *slot = c->slot; 624 perl_slots *slot = c->slot;
487 c->slot = 0; 625 c->slot = 0;
488 626
489 PL_mainstack = c->mainstack; 627 PL_mainstack = c->mainstack;
490 628
491 GvSV (PL_defgv) = slot->defsv; 629 GvSV (PL_defgv) = slot->defsv;
492 GvAV (PL_defgv) = slot->defav; 630 GvAV (PL_defgv) = slot->defav;
493 GvSV (PL_errgv) = slot->errsv; 631 GvSV (PL_errgv) = slot->errsv;
494 GvSV (irsgv) = slot->irsgv; 632 GvSV (irsgv) = slot->irsgv;
633 GvHV (PL_hintgv) = slot->hinthv;
495 634
496 #define VAR(name,type) PL_ ## name = slot->name; 635 #define VAR(name,type) PL_ ## name = slot->name;
497 # include "state.h" 636 # include "state.h"
498 #undef VAR 637 #undef VAR
499 638
… …
513 PUTBACK; 652 PUTBACK;
514 } 653 }
515 654
516 slf_frame = c->slf_frame; 655 slf_frame = c->slf_frame;
517 CORO_THROW = c->except; 656 CORO_THROW = c->except;
657
658 if (expect_false (enable_times))
659 {
660 if (expect_false (!times_valid))
661 coro_times_update ();
662
663 coro_times_sub (c);
664 }
665
666 if (expect_false (c->on_enter))
667 {
668 int i;
669
670 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
671 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
672 }
673
674 SWAP_SVS (c);
518} 675}
519 676
520static void 677static void
521save_perl (pTHX_ Coro__State c) 678save_perl (pTHX_ Coro__State c)
522{ 679{
680 SWAP_SVS (c);
681
682 if (expect_false (c->on_leave))
683 {
684 int i;
685
686 for (i = AvFILLp (c->on_leave); i >= 0; --i)
687 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
688 }
689
690 times_valid = 0;
691
692 if (expect_false (enable_times))
693 {
694 coro_times_update (); times_valid = 1;
695 coro_times_add (c);
696 }
697
523 c->except = CORO_THROW; 698 c->except = CORO_THROW;
524 c->slf_frame = slf_frame; 699 c->slf_frame = slf_frame;
525 700
526 { 701 {
527 dSP; 702 dSP;
… …
540 { 715 {
541 while (expect_true (cxix >= 0)) 716 while (expect_true (cxix >= 0))
542 { 717 {
543 PERL_CONTEXT *cx = &ccstk[cxix--]; 718 PERL_CONTEXT *cx = &ccstk[cxix--];
544 719
545 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT)) 720 if (expect_true (CxTYPE (cx) == CXt_SUB) || expect_false (CxTYPE (cx) == CXt_FORMAT))
546 { 721 {
547 CV *cv = cx->blk_sub.cv; 722 CV *cv = cx->blk_sub.cv;
548 723
549 if (expect_true (CvDEPTH (cv))) 724 if (expect_true (CvDEPTH (cv)))
550 { 725 {
… …
574 /* we manually unroll here, as usually 2 slots is enough */ 749 /* we manually unroll here, as usually 2 slots is enough */
575 if (SLOT_COUNT >= 1) CXINC; 750 if (SLOT_COUNT >= 1) CXINC;
576 if (SLOT_COUNT >= 2) CXINC; 751 if (SLOT_COUNT >= 2) CXINC;
577 if (SLOT_COUNT >= 3) CXINC; 752 if (SLOT_COUNT >= 3) CXINC;
578 { 753 {
579 int i; 754 unsigned int i;
580 for (i = 3; i < SLOT_COUNT; ++i) 755 for (i = 3; i < SLOT_COUNT; ++i)
581 CXINC; 756 CXINC;
582 } 757 }
583 cxstack_ix -= SLOT_COUNT; /* undo allocation */ 758 cxstack_ix -= SLOT_COUNT; /* undo allocation */
584 759
585 c->mainstack = PL_mainstack; 760 c->mainstack = PL_mainstack;
586 761
587 { 762 {
588 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1); 763 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
589 764
590 slot->defav = GvAV (PL_defgv); 765 slot->defav = GvAV (PL_defgv);
591 slot->defsv = DEFSV; 766 slot->defsv = DEFSV;
592 slot->errsv = ERRSV; 767 slot->errsv = ERRSV;
593 slot->irsgv = GvSV (irsgv); 768 slot->irsgv = GvSV (irsgv);
769 slot->hinthv = GvHV (PL_hintgv);
594 770
595 #define VAR(name,type) slot->name = PL_ ## name; 771 #define VAR(name,type) slot->name = PL_ ## name;
596 # include "state.h" 772 # include "state.h"
597 #undef VAR 773 #undef VAR
598 } 774 }
… …
603 * of perl.c:init_stacks, except that it uses less memory 779 * of perl.c:init_stacks, except that it uses less memory
604 * on the (sometimes correct) assumption that coroutines do 780 * on the (sometimes correct) assumption that coroutines do
605 * not usually need a lot of stackspace. 781 * not usually need a lot of stackspace.
606 */ 782 */
607#if CORO_PREFER_PERL_FUNCTIONS 783#if CORO_PREFER_PERL_FUNCTIONS
608# define coro_init_stacks init_stacks 784# define coro_init_stacks(thx) init_stacks ()
609#else 785#else
610static void 786static void
611coro_init_stacks (pTHX) 787coro_init_stacks (pTHX)
612{ 788{
613 PL_curstackinfo = new_stackinfo(32, 8); 789 PL_curstackinfo = new_stackinfo(32, 8);
… …
676#if !PERL_VERSION_ATLEAST (5,10,0) 852#if !PERL_VERSION_ATLEAST (5,10,0)
677 Safefree (PL_retstack); 853 Safefree (PL_retstack);
678#endif 854#endif
679} 855}
680 856
857#define CORO_RSS \
858 rss += sizeof (SYM (curstackinfo)); \
859 rss += (SYM (curstackinfo->si_cxmax) + 1) * sizeof (PERL_CONTEXT); \
860 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (SYM (curstack))) * sizeof (SV *); \
861 rss += SYM (tmps_max) * sizeof (SV *); \
862 rss += (SYM (markstack_max) - SYM (markstack_ptr)) * sizeof (I32); \
863 rss += SYM (scopestack_max) * sizeof (I32); \
864 rss += SYM (savestack_max) * sizeof (ANY);
865
681static size_t 866static size_t
682coro_rss (pTHX_ struct coro *coro) 867coro_rss (pTHX_ struct coro *coro)
683{ 868{
684 size_t rss = sizeof (*coro); 869 size_t rss = sizeof (*coro);
685 870
686 if (coro->mainstack) 871 if (coro->mainstack)
687 { 872 {
688 perl_slots tmp_slot;
689 perl_slots *slot;
690
691 if (coro->flags & CF_RUNNING) 873 if (coro->flags & CF_RUNNING)
692 { 874 {
693 slot = &tmp_slot; 875 #define SYM(sym) PL_ ## sym
694 876 CORO_RSS;
695 #define VAR(name,type) slot->name = PL_ ## name;
696 # include "state.h"
697 #undef VAR 877 #undef SYM
698 } 878 }
699 else 879 else
700 slot = coro->slot;
701
702 if (slot)
703 { 880 {
704 rss += sizeof (slot->curstackinfo); 881 #define SYM(sym) coro->slot->sym
705 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 882 CORO_RSS;
706 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 883 #undef SYM
707 rss += slot->tmps_max * sizeof (SV *);
708 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
709 rss += slot->scopestack_max * sizeof (I32);
710 rss += slot->savestack_max * sizeof (ANY);
711
712#if !PERL_VERSION_ATLEAST (5,10,0)
713 rss += slot->retstack_max * sizeof (OP *);
714#endif
715 } 884 }
716 } 885 }
717 886
718 return rss; 887 return rss;
719} 888}
… …
732#endif 901#endif
733 902
734/* 903/*
735 * This overrides the default magic get method of %SIG elements. 904 * This overrides the default magic get method of %SIG elements.
736 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 905 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
737 * and instead of tryign to save and restore the hash elements, we just provide 906 * and instead of trying to save and restore the hash elements, we just provide
738 * readback here. 907 * readback here.
739 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
740 * not expecting this to actually change the hook. This is a potential problem
741 * when a schedule happens then, but we ignore this.
742 */ 908 */
743static int 909static int
744coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 910coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
745{ 911{
746 const char *s = MgPV_nolen_const (mg); 912 const char *s = MgPV_nolen_const (mg);
… …
799 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 965 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
800 966
801 if (svp) 967 if (svp)
802 { 968 {
803 SV *old = *svp; 969 SV *old = *svp;
804 *svp = newSVsv (sv); 970 *svp = SvOK (sv) ? newSVsv (sv) : 0;
805 SvREFCNT_dec (old); 971 SvREFCNT_dec (old);
806 return 0; 972 return 0;
807 } 973 }
808 } 974 }
809 975
… …
821slf_check_nop (pTHX_ struct CoroSLF *frame) 987slf_check_nop (pTHX_ struct CoroSLF *frame)
822{ 988{
823 return 0; 989 return 0;
824} 990}
825 991
826static UNOP coro_setup_op; 992static int
993slf_check_repeat (pTHX_ struct CoroSLF *frame)
994{
995 return 1;
996}
997
998static UNOP init_perl_op;
827 999
828static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1000static void NOINLINE /* noinline to keep it out of the transfer fast path */
829coro_setup (pTHX_ struct coro *coro) 1001init_perl (pTHX_ struct coro *coro)
830{ 1002{
831 /* 1003 /*
832 * emulate part of the perl startup here. 1004 * emulate part of the perl startup here.
833 */ 1005 */
834 coro_init_stacks (aTHX); 1006 coro_init_stacks (aTHX);
835 1007
836 PL_runops = RUNOPS_DEFAULT; 1008 PL_runops = RUNOPS_DEFAULT;
837 PL_curcop = &PL_compiling; 1009 PL_curcop = &PL_compiling;
838 PL_in_eval = EVAL_NULL; 1010 PL_in_eval = EVAL_NULL;
839 PL_comppad = 0; 1011 PL_comppad = 0;
1012 PL_comppad_name = 0;
1013 PL_comppad_name_fill = 0;
1014 PL_comppad_name_floor = 0;
840 PL_curpm = 0; 1015 PL_curpm = 0;
841 PL_curpad = 0; 1016 PL_curpad = 0;
842 PL_localizing = 0; 1017 PL_localizing = 0;
843 PL_dirty = 0; 1018 PL_dirty = 0;
844 PL_restartop = 0; 1019 PL_restartop = 0;
845#if PERL_VERSION_ATLEAST (5,10,0) 1020#if PERL_VERSION_ATLEAST (5,10,0)
846 PL_parser = 0; 1021 PL_parser = 0;
847#endif 1022#endif
1023 PL_hints = 0;
848 1024
849 /* recreate the die/warn hooks */ 1025 /* recreate the die/warn hooks */
850 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook ); 1026 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
851 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook); 1027 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
852 1028
853 GvSV (PL_defgv) = newSV (0); 1029 GvSV (PL_defgv) = newSV (0);
854 GvAV (PL_defgv) = coro->args; coro->args = 0; 1030 GvAV (PL_defgv) = coro->args; coro->args = 0;
855 GvSV (PL_errgv) = newSV (0); 1031 GvSV (PL_errgv) = newSV (0);
856 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 1032 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
1033 GvHV (PL_hintgv) = 0;
857 PL_rs = newSVsv (GvSV (irsgv)); 1034 PL_rs = newSVsv (GvSV (irsgv));
858 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv); 1035 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
859 1036
860 { 1037 {
861 dSP; 1038 dSP;
862 UNOP myop; 1039 UNOP myop;
863 1040
864 Zero (&myop, 1, UNOP); 1041 Zero (&myop, 1, UNOP);
865 myop.op_next = Nullop; 1042 myop.op_next = Nullop;
1043 myop.op_type = OP_ENTERSUB;
866 myop.op_flags = OPf_WANT_VOID; 1044 myop.op_flags = OPf_WANT_VOID;
867 1045
868 PUSHMARK (SP); 1046 PUSHMARK (SP);
869 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 1047 PUSHs ((SV *)coro->startcv);
870 PUTBACK; 1048 PUTBACK;
871 PL_op = (OP *)&myop; 1049 PL_op = (OP *)&myop;
872 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1050 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
873 SPAGAIN;
874 } 1051 }
875 1052
876 /* this newly created coroutine might be run on an existing cctx which most 1053 /* this newly created coroutine might be run on an existing cctx which most
877 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here. 1054 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
878 */ 1055 */
879 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1056 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
880 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1057 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
881 1058
882 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1059 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
883 coro_setup_op.op_next = PL_op; 1060 init_perl_op.op_next = PL_op;
884 coro_setup_op.op_type = OP_CUSTOM; 1061 init_perl_op.op_type = OP_ENTERSUB;
885 coro_setup_op.op_ppaddr = pp_slf; 1062 init_perl_op.op_ppaddr = pp_slf;
886 /* no flags required, as an init function won't be called */ 1063 /* no flags etc. required, as an init function won't be called */
887 1064
888 PL_op = (OP *)&coro_setup_op; 1065 PL_op = (OP *)&init_perl_op;
889 1066
890 /* copy throw, in case it was set before coro_setup */ 1067 /* copy throw, in case it was set before init_perl */
891 CORO_THROW = coro->except; 1068 CORO_THROW = coro->except;
892}
893 1069
1070 SWAP_SVS (coro);
1071
1072 if (expect_false (enable_times))
1073 {
1074 coro_times_update ();
1075 coro_times_sub (coro);
1076 }
1077}
1078
894static void 1079static void
895coro_destruct (pTHX_ struct coro *coro) 1080coro_unwind_stacks (pTHX)
896{ 1081{
897 if (!IN_DESTRUCT) 1082 if (!IN_DESTRUCT)
898 { 1083 {
899 /* restore all saved variables and stuff */ 1084 /* restore all saved variables and stuff */
900 LEAVE_SCOPE (0); 1085 LEAVE_SCOPE (0);
… …
908 POPSTACK_TO (PL_mainstack); 1093 POPSTACK_TO (PL_mainstack);
909 1094
910 /* unwind main stack */ 1095 /* unwind main stack */
911 dounwind (-1); 1096 dounwind (-1);
912 } 1097 }
1098}
913 1099
914 SvREFCNT_dec (GvSV (PL_defgv)); 1100static void
915 SvREFCNT_dec (GvAV (PL_defgv)); 1101destroy_perl (pTHX_ struct coro *coro)
916 SvREFCNT_dec (GvSV (PL_errgv)); 1102{
917 SvREFCNT_dec (PL_defoutgv); 1103 SV *svf [9];
918 SvREFCNT_dec (PL_rs);
919 SvREFCNT_dec (GvSV (irsgv));
920 1104
921 SvREFCNT_dec (PL_diehook);
922 SvREFCNT_dec (PL_warnhook);
923 1105 {
924 SvREFCNT_dec (CORO_THROW); 1106 struct coro *current = SvSTATE_current;
1107
1108 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1109
1110 save_perl (aTHX_ current);
1111 load_perl (aTHX_ coro);
1112
1113 coro_unwind_stacks (aTHX);
1114 coro_destruct_stacks (aTHX);
1115
1116 /* restore swapped sv's */
1117 SWAP_SVS (coro);
1118
1119 // now save some sv's to be free'd later
1120 svf [0] = GvSV (PL_defgv);
1121 svf [1] = (SV *)GvAV (PL_defgv);
1122 svf [2] = GvSV (PL_errgv);
1123 svf [3] = (SV *)PL_defoutgv;
1124 svf [4] = PL_rs;
1125 svf [5] = GvSV (irsgv);
1126 svf [6] = (SV *)GvHV (PL_hintgv);
1127 svf [7] = PL_diehook;
1128 svf [8] = PL_warnhook;
1129 assert (9 == sizeof (svf) / sizeof (*svf));
1130
1131 load_perl (aTHX_ current);
1132 }
1133
1134 {
1135 unsigned int i;
1136
1137 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1138 SvREFCNT_dec (svf [i]);
1139
925 SvREFCNT_dec (coro->saved_deffh); 1140 SvREFCNT_dec (coro->saved_deffh);
926 SvREFCNT_dec (coro->rouse_cb); 1141 SvREFCNT_dec (coro->rouse_cb);
927 1142 SvREFCNT_dec (coro->invoke_cb);
928 coro_destruct_stacks (aTHX); 1143 SvREFCNT_dec (coro->invoke_av);
1144 }
929} 1145}
930 1146
931INLINE void 1147INLINE void
932free_coro_mortal (pTHX) 1148free_coro_mortal (pTHX)
933{ 1149{
… …
941static int 1157static int
942runops_trace (pTHX) 1158runops_trace (pTHX)
943{ 1159{
944 COP *oldcop = 0; 1160 COP *oldcop = 0;
945 int oldcxix = -2; 1161 int oldcxix = -2;
946 struct coro *coro = SvSTATE_current; /* trace cctx is tied to specific coro */
947 coro_cctx *cctx = coro->cctx;
948 1162
949 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 1163 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
950 { 1164 {
951 PERL_ASYNC_CHECK (); 1165 PERL_ASYNC_CHECK ();
952 1166
953 if (cctx->flags & CC_TRACE_ALL) 1167 if (cctx_current->flags & CC_TRACE_ALL)
954 { 1168 {
955 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 1169 if (PL_op->op_type == OP_LEAVESUB && cctx_current->flags & CC_TRACE_SUB)
956 { 1170 {
957 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1171 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
958 SV **bot, **top; 1172 SV **bot, **top;
959 AV *av = newAV (); /* return values */ 1173 AV *av = newAV (); /* return values */
960 SV **cb; 1174 SV **cb;
… …
997 1211
998 if (PL_curcop != &PL_compiling) 1212 if (PL_curcop != &PL_compiling)
999 { 1213 {
1000 SV **cb; 1214 SV **cb;
1001 1215
1002 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 1216 if (oldcxix != cxstack_ix && cctx_current->flags & CC_TRACE_SUB)
1003 { 1217 {
1004 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 1218 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
1005 1219
1006 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 1220 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
1007 { 1221 {
1008 runops_proc_t old_runops = PL_runops;
1009 dSP; 1222 dSP;
1010 GV *gv = CvGV (cx->blk_sub.cv); 1223 GV *gv = CvGV (cx->blk_sub.cv);
1011 SV *fullname = sv_2mortal (newSV (0)); 1224 SV *fullname = sv_2mortal (newSV (0));
1012 1225
1013 if (isGV (gv)) 1226 if (isGV (gv))
… …
1018 SAVETMPS; 1231 SAVETMPS;
1019 EXTEND (SP, 3); 1232 EXTEND (SP, 3);
1020 PUSHMARK (SP); 1233 PUSHMARK (SP);
1021 PUSHs (&PL_sv_yes); 1234 PUSHs (&PL_sv_yes);
1022 PUSHs (fullname); 1235 PUSHs (fullname);
1023 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1236 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1024 PUTBACK; 1237 PUTBACK;
1025 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1238 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1026 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1239 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1027 SPAGAIN; 1240 SPAGAIN;
1028 FREETMPS; 1241 FREETMPS;
… …
1031 } 1244 }
1032 1245
1033 oldcxix = cxstack_ix; 1246 oldcxix = cxstack_ix;
1034 } 1247 }
1035 1248
1036 if (cctx->flags & CC_TRACE_LINE) 1249 if (cctx_current->flags & CC_TRACE_LINE)
1037 { 1250 {
1038 dSP; 1251 dSP;
1039 1252
1040 PL_runops = RUNOPS_DEFAULT; 1253 PL_runops = RUNOPS_DEFAULT;
1041 ENTER; 1254 ENTER;
… …
1060 1273
1061 TAINT_NOT; 1274 TAINT_NOT;
1062 return 0; 1275 return 0;
1063} 1276}
1064 1277
1065static struct coro_cctx *cctx_ssl_cctx;
1066static struct CoroSLF cctx_ssl_frame; 1278static struct CoroSLF cctx_ssl_frame;
1067 1279
1068static void 1280static void
1069slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta) 1281slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1070{ 1282{
1071 ta->prev = (struct coro *)cctx_ssl_cctx;
1072 ta->next = 0; 1283 ta->prev = 0;
1073} 1284}
1074 1285
1075static int 1286static int
1076slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame) 1287slf_check_set_stacklevel (pTHX_ struct CoroSLF *frame)
1077{ 1288{
… …
1080 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */ 1291 return frame->check (aTHX_ frame); /* execute the restored frame - there must be one */
1081} 1292}
1082 1293
1083/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */ 1294/* initialises PL_top_env and injects a pseudo-slf-call to set the stacklevel */
1084static void NOINLINE 1295static void NOINLINE
1085cctx_prepare (pTHX_ coro_cctx *cctx) 1296cctx_prepare (pTHX)
1086{ 1297{
1087 PL_top_env = &PL_start_env; 1298 PL_top_env = &PL_start_env;
1088 1299
1089 if (cctx->flags & CC_TRACE) 1300 if (cctx_current->flags & CC_TRACE)
1090 PL_runops = runops_trace; 1301 PL_runops = runops_trace;
1091 1302
1092 /* we already must be executing an SLF op, there is no other valid way 1303 /* we already must be executing an SLF op, there is no other valid way
1093 * that can lead to creation of a new cctx */ 1304 * that can lead to creation of a new cctx */
1094 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)", 1305 assert (("FATAL: can't prepare slf-less cctx in Coro module (please report)",
1095 slf_frame.prepare && PL_op->op_ppaddr == pp_slf)); 1306 slf_frame.prepare && PL_op->op_ppaddr == pp_slf));
1096 1307
1097 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */ 1308 /* we must emulate leaving pp_slf, which is done inside slf_check_set_stacklevel */
1098 cctx_ssl_cctx = cctx;
1099 cctx_ssl_frame = slf_frame; 1309 cctx_ssl_frame = slf_frame;
1100 1310
1101 slf_frame.prepare = slf_prepare_set_stacklevel; 1311 slf_frame.prepare = slf_prepare_set_stacklevel;
1102 slf_frame.check = slf_check_set_stacklevel; 1312 slf_frame.check = slf_check_set_stacklevel;
1103} 1313}
… …
1126 /* normally we would need to skip the entersub here */ 1336 /* normally we would need to skip the entersub here */
1127 /* not doing so will re-execute it, which is exactly what we want */ 1337 /* not doing so will re-execute it, which is exactly what we want */
1128 /* PL_nop = PL_nop->op_next */ 1338 /* PL_nop = PL_nop->op_next */
1129 1339
1130 /* inject a fake subroutine call to cctx_init */ 1340 /* inject a fake subroutine call to cctx_init */
1131 cctx_prepare (aTHX_ (coro_cctx *)arg); 1341 cctx_prepare (aTHX);
1132 1342
1133 /* cctx_run is the alternative tail of transfer() */ 1343 /* cctx_run is the alternative tail of transfer() */
1134 transfer_tail (aTHX); 1344 transfer_tail (aTHX);
1135 1345
1136 /* somebody or something will hit me for both perl_run and PL_restartop */ 1346 /* somebody or something will hit me for both perl_run and PL_restartop */
1137 PL_restartop = PL_op; 1347 PL_restartop = PL_op;
1138 perl_run (PL_curinterp); 1348 perl_run (PL_curinterp);
1349 /*
1350 * Unfortunately, there is no way to get at the return values of the
1351 * coro body here, as perl_run destroys these. Likewise, we cannot catch
1352 * runtime errors here, as this is just a random interpreter, not a thread.
1353 */
1139 1354
1140 /* 1355 /*
1141 * If perl-run returns we assume exit() was being called or the coro 1356 * If perl-run returns we assume exit() was being called or the coro
1142 * fell off the end, which seems to be the only valid (non-bug) 1357 * fell off the end, which seems to be the only valid (non-bug)
1143 * reason for perl_run to return. We try to exit by jumping to the 1358 * reason for perl_run to return. We try to exit by jumping to the
1144 * bootstrap-time "top" top_env, as we cannot restore the "main" 1359 * bootstrap-time "top" top_env, as we cannot restore the "main"
1145 * coroutine as Coro has no such concept 1360 * coroutine as Coro has no such concept.
1361 * This actually isn't valid with the pthread backend, but OSes requiring
1362 * that backend are too broken to do it in a standards-compliant way.
1146 */ 1363 */
1147 PL_top_env = main_top_env; 1364 PL_top_env = main_top_env;
1148 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1365 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1149 } 1366 }
1150} 1367}
… …
1227cctx_destroy (coro_cctx *cctx) 1444cctx_destroy (coro_cctx *cctx)
1228{ 1445{
1229 if (!cctx) 1446 if (!cctx)
1230 return; 1447 return;
1231 1448
1449 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1450
1232 --cctx_count; 1451 --cctx_count;
1233 coro_destroy (&cctx->cctx); 1452 coro_destroy (&cctx->cctx);
1234 1453
1235 /* coro_transfer creates new, empty cctx's */ 1454 /* coro_transfer creates new, empty cctx's */
1236 if (cctx->sptr) 1455 if (cctx->sptr)
… …
1299 /* TODO: throwing up here is considered harmful */ 1518 /* TODO: throwing up here is considered harmful */
1300 1519
1301 if (expect_true (prev != next)) 1520 if (expect_true (prev != next))
1302 { 1521 {
1303 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1522 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1304 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,"); 1523 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1305 1524
1306 if (expect_false (next->flags & CF_RUNNING))
1307 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1308
1309 if (expect_false (next->flags & CF_DESTROYED)) 1525 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1310 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1526 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1311 1527
1312#if !PERL_VERSION_ATLEAST (5,10,0) 1528#if !PERL_VERSION_ATLEAST (5,10,0)
1313 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1529 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1314 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1530 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1315#endif 1531#endif
… …
1321transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1537transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1322{ 1538{
1323 dSTACKLEVEL; 1539 dSTACKLEVEL;
1324 1540
1325 /* sometimes transfer is only called to set idle_sp */ 1541 /* sometimes transfer is only called to set idle_sp */
1326 if (expect_false (!next)) 1542 if (expect_false (!prev))
1327 { 1543 {
1328 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1544 cctx_current->idle_sp = STACKLEVEL;
1329 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1545 assert (cctx_current->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1330 } 1546 }
1331 else if (expect_true (prev != next)) 1547 else if (expect_true (prev != next))
1332 { 1548 {
1333 coro_cctx *prev__cctx; 1549 coro_cctx *cctx_prev;
1334 1550
1335 if (expect_false (prev->flags & CF_NEW)) 1551 if (expect_false (prev->flags & CF_NEW))
1336 { 1552 {
1337 /* create a new empty/source context */ 1553 /* create a new empty/source context */
1338 prev->cctx = cctx_new_empty ();
1339 prev->flags &= ~CF_NEW; 1554 prev->flags &= ~CF_NEW;
1340 prev->flags |= CF_RUNNING; 1555 prev->flags |= CF_RUNNING;
1341 } 1556 }
1342 1557
1343 prev->flags &= ~CF_RUNNING; 1558 prev->flags &= ~CF_RUNNING;
… …
1349 if (expect_false (next->flags & CF_NEW)) 1564 if (expect_false (next->flags & CF_NEW))
1350 { 1565 {
1351 /* need to start coroutine */ 1566 /* need to start coroutine */
1352 next->flags &= ~CF_NEW; 1567 next->flags &= ~CF_NEW;
1353 /* setup coroutine call */ 1568 /* setup coroutine call */
1354 coro_setup (aTHX_ next); 1569 init_perl (aTHX_ next);
1355 } 1570 }
1356 else 1571 else
1357 load_perl (aTHX_ next); 1572 load_perl (aTHX_ next);
1358 1573
1359 prev__cctx = prev->cctx;
1360
1361 /* possibly untie and reuse the cctx */ 1574 /* possibly untie and reuse the cctx */
1362 if (expect_true ( 1575 if (expect_true (
1363 prev__cctx->idle_sp == STACKLEVEL 1576 cctx_current->idle_sp == STACKLEVEL
1364 && !(prev__cctx->flags & CC_TRACE) 1577 && !(cctx_current->flags & CC_TRACE)
1365 && !force_cctx 1578 && !force_cctx
1366 )) 1579 ))
1367 { 1580 {
1368 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */ 1581 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1369 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te)); 1582 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == cctx_current->idle_te));
1370 1583
1371 prev->cctx = 0;
1372
1373 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1584 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get. */
1374 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1585 /* without this the next cctx_get might destroy the running cctx while still in use */
1375 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1586 if (expect_false (CCTX_EXPIRED (cctx_current)))
1376 if (!next->cctx) 1587 if (expect_true (!next->cctx))
1377 next->cctx = cctx_get (aTHX); 1588 next->cctx = cctx_get (aTHX);
1378 1589
1379 cctx_put (prev__cctx); 1590 cctx_put (cctx_current);
1380 } 1591 }
1592 else
1593 prev->cctx = cctx_current;
1381 1594
1382 ++next->usecount; 1595 ++next->usecount;
1383 1596
1384 if (expect_true (!next->cctx)) 1597 cctx_prev = cctx_current;
1385 next->cctx = cctx_get (aTHX); 1598 cctx_current = expect_false (next->cctx) ? next->cctx : cctx_get (aTHX);
1386 1599
1387 if (expect_false (prev__cctx != next->cctx)) 1600 next->cctx = 0;
1601
1602 if (expect_false (cctx_prev != cctx_current))
1388 { 1603 {
1389 prev__cctx->top_env = PL_top_env; 1604 cctx_prev->top_env = PL_top_env;
1390 PL_top_env = next->cctx->top_env; 1605 PL_top_env = cctx_current->top_env;
1391 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1606 coro_transfer (&cctx_prev->cctx, &cctx_current->cctx);
1392 } 1607 }
1393 1608
1394 transfer_tail (aTHX); 1609 transfer_tail (aTHX);
1395 } 1610 }
1396} 1611}
… …
1404coro_state_destroy (pTHX_ struct coro *coro) 1619coro_state_destroy (pTHX_ struct coro *coro)
1405{ 1620{
1406 if (coro->flags & CF_DESTROYED) 1621 if (coro->flags & CF_DESTROYED)
1407 return 0; 1622 return 0;
1408 1623
1409 if (coro->on_destroy) 1624 if (coro->on_destroy && !PL_dirty)
1410 coro->on_destroy (aTHX_ coro); 1625 coro->on_destroy (aTHX_ coro);
1411 1626
1412 coro->flags |= CF_DESTROYED; 1627 coro->flags |= CF_DESTROYED;
1413 1628
1414 if (coro->flags & CF_READY) 1629 if (coro->flags & CF_READY)
… …
1418 --coro_nready; 1633 --coro_nready;
1419 } 1634 }
1420 else 1635 else
1421 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1636 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1422 1637
1423 if (coro->mainstack && coro->mainstack != main_mainstack) 1638 if (coro->mainstack
1424 { 1639 && coro->mainstack != main_mainstack
1425 struct coro temp; 1640 && coro->slot
1426 1641 && !PL_dirty)
1427 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1428
1429 save_perl (aTHX_ &temp);
1430 load_perl (aTHX_ coro); 1642 destroy_perl (aTHX_ coro);
1431
1432 coro_destruct (aTHX_ coro);
1433
1434 load_perl (aTHX_ &temp);
1435
1436 coro->slot = 0;
1437 }
1438
1439 cctx_destroy (coro->cctx);
1440 SvREFCNT_dec (coro->args);
1441 1643
1442 if (coro->next) coro->next->prev = coro->prev; 1644 if (coro->next) coro->next->prev = coro->prev;
1443 if (coro->prev) coro->prev->next = coro->next; 1645 if (coro->prev) coro->prev->next = coro->next;
1444 if (coro == coro_first) coro_first = coro->next; 1646 if (coro == coro_first) coro_first = coro->next;
1647
1648 cctx_destroy (coro->cctx);
1649 SvREFCNT_dec (coro->startcv);
1650 SvREFCNT_dec (coro->args);
1651 SvREFCNT_dec (coro->swap_sv);
1652 SvREFCNT_dec (CORO_THROW);
1445 1653
1446 return 1; 1654 return 1;
1447} 1655}
1448 1656
1449static int 1657static int
… …
1499 1707
1500 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1708 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1501 TRANSFER (ta, 1); 1709 TRANSFER (ta, 1);
1502} 1710}
1503 1711
1504/*****************************************************************************/
1505/* gensub: simple closure generation utility */
1506
1507#define GENSUB_ARG CvXSUBANY (cv).any_ptr
1508
1509/* create a closure from XS, returns a code reference */
1510/* the arg can be accessed via GENSUB_ARG from the callback */
1511/* the callback must use dXSARGS/XSRETURN */
1512static SV *
1513gensub (pTHX_ void (*xsub)(pTHX_ CV *), void *arg)
1514{
1515 CV *cv = (CV *)newSV (0);
1516
1517 sv_upgrade ((SV *)cv, SVt_PVCV);
1518
1519 CvANON_on (cv);
1520 CvISXSUB_on (cv);
1521 CvXSUB (cv) = xsub;
1522 GENSUB_ARG = arg;
1523
1524 return newRV_noinc ((SV *)cv);
1525}
1526
1527/** Coro ********************************************************************/ 1712/** Coro ********************************************************************/
1528 1713
1529INLINE void 1714INLINE void
1530coro_enq (pTHX_ struct coro *coro) 1715coro_enq (pTHX_ struct coro *coro)
1531{ 1716{
1532 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1717 struct coro **ready = coro_ready [coro->prio - CORO_PRIO_MIN];
1533}
1534 1718
1535INLINE SV * 1719 SvREFCNT_inc_NN (coro->hv);
1720
1721 coro->next_ready = 0;
1722 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1723 ready [1] = coro;
1724}
1725
1726INLINE struct coro *
1536coro_deq (pTHX) 1727coro_deq (pTHX)
1537{ 1728{
1538 int prio; 1729 int prio;
1539 1730
1540 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1731 for (prio = CORO_PRIO_MAX - CORO_PRIO_MIN + 1; --prio >= 0; )
1541 if (AvFILLp (coro_ready [prio]) >= 0) 1732 {
1542 return av_shift (coro_ready [prio]); 1733 struct coro **ready = coro_ready [prio];
1734
1735 if (ready [0])
1736 {
1737 struct coro *coro = ready [0];
1738 ready [0] = coro->next_ready;
1739 return coro;
1740 }
1741 }
1543 1742
1544 return 0; 1743 return 0;
1744}
1745
1746static void
1747invoke_sv_ready_hook_helper (void)
1748{
1749 dTHX;
1750 dSP;
1751
1752 ENTER;
1753 SAVETMPS;
1754
1755 PUSHMARK (SP);
1756 PUTBACK;
1757 call_sv (coro_readyhook, G_VOID | G_DISCARD);
1758
1759 FREETMPS;
1760 LEAVE;
1545} 1761}
1546 1762
1547static int 1763static int
1548api_ready (pTHX_ SV *coro_sv) 1764api_ready (pTHX_ SV *coro_sv)
1549{ 1765{
1550 struct coro *coro;
1551 SV *sv_hook;
1552 void (*xs_hook)(void);
1553
1554 if (SvROK (coro_sv))
1555 coro_sv = SvRV (coro_sv);
1556
1557 coro = SvSTATE (coro_sv); 1766 struct coro *coro = SvSTATE (coro_sv);
1558 1767
1559 if (coro->flags & CF_READY) 1768 if (coro->flags & CF_READY)
1560 return 0; 1769 return 0;
1561 1770
1562 coro->flags |= CF_READY; 1771 coro->flags |= CF_READY;
1563 1772
1564 sv_hook = coro_nready ? 0 : coro_readyhook;
1565 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1566
1567 coro_enq (aTHX_ coro); 1773 coro_enq (aTHX_ coro);
1568 ++coro_nready;
1569 1774
1570 if (sv_hook) 1775 if (!coro_nready++)
1571 { 1776 if (coroapi.readyhook)
1572 dSP; 1777 coroapi.readyhook ();
1573
1574 ENTER;
1575 SAVETMPS;
1576
1577 PUSHMARK (SP);
1578 PUTBACK;
1579 call_sv (sv_hook, G_VOID | G_DISCARD);
1580
1581 FREETMPS;
1582 LEAVE;
1583 }
1584
1585 if (xs_hook)
1586 xs_hook ();
1587 1778
1588 return 1; 1779 return 1;
1589} 1780}
1590 1781
1591static int 1782static int
1592api_is_ready (pTHX_ SV *coro_sv) 1783api_is_ready (pTHX_ SV *coro_sv)
1593{ 1784{
1594 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1785 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1595} 1786}
1596 1787
1788/* expects to own a reference to next->hv */
1597INLINE void 1789INLINE void
1598prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1790prepare_schedule_to (pTHX_ struct coro_transfer_args *ta, struct coro *next)
1599{ 1791{
1600 SV *prev_sv, *next_sv;
1601
1602 for (;;)
1603 {
1604 next_sv = coro_deq (aTHX);
1605
1606 /* nothing to schedule: call the idle handler */
1607 if (expect_false (!next_sv))
1608 {
1609 dSP;
1610
1611 ENTER;
1612 SAVETMPS;
1613
1614 PUSHMARK (SP);
1615 PUTBACK;
1616 call_sv (get_sv ("Coro::idle", FALSE), G_VOID | G_DISCARD);
1617
1618 FREETMPS;
1619 LEAVE;
1620 continue;
1621 }
1622
1623 ta->next = SvSTATE_hv (next_sv);
1624
1625 /* cannot transfer to destroyed coros, skip and look for next */
1626 if (expect_false (ta->next->flags & CF_DESTROYED))
1627 {
1628 SvREFCNT_dec (next_sv);
1629 /* coro_nready has already been taken care of by destroy */
1630 continue;
1631 }
1632
1633 --coro_nready;
1634 break;
1635 }
1636
1637 /* free this only after the transfer */
1638 prev_sv = SvRV (coro_current); 1792 SV *prev_sv = SvRV (coro_current);
1793
1639 ta->prev = SvSTATE_hv (prev_sv); 1794 ta->prev = SvSTATE_hv (prev_sv);
1795 ta->next = next;
1796
1640 TRANSFER_CHECK (*ta); 1797 TRANSFER_CHECK (*ta);
1641 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY)); 1798
1642 ta->next->flags &= ~CF_READY;
1643 SvRV_set (coro_current, next_sv); 1799 SvRV_set (coro_current, (SV *)next->hv);
1644 1800
1645 free_coro_mortal (aTHX); 1801 free_coro_mortal (aTHX);
1646 coro_mortal = prev_sv; 1802 coro_mortal = prev_sv;
1647} 1803}
1648 1804
1805static void
1806prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1807{
1808 for (;;)
1809 {
1810 struct coro *next = coro_deq (aTHX);
1811
1812 if (expect_true (next))
1813 {
1814 /* cannot transfer to destroyed coros, skip and look for next */
1815 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1816 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1817 else
1818 {
1819 next->flags &= ~CF_READY;
1820 --coro_nready;
1821
1822 prepare_schedule_to (aTHX_ ta, next);
1823 break;
1824 }
1825 }
1826 else
1827 {
1828 /* nothing to schedule: call the idle handler */
1829 if (SvROK (sv_idle)
1830 && SvOBJECT (SvRV (sv_idle)))
1831 {
1832 if (SvRV (sv_idle) == SvRV (coro_current))
1833 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1834
1835 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1836 api_ready (aTHX_ SvRV (sv_idle));
1837 --coro_nready;
1838 }
1839 else
1840 {
1841 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1842 dSP;
1843
1844 ENTER;
1845 SAVETMPS;
1846
1847 PUSHMARK (SP);
1848 PUTBACK;
1849 call_sv (sv_idle, G_VOID | G_DISCARD);
1850
1851 FREETMPS;
1852 LEAVE;
1853 }
1854 }
1855 }
1856}
1857
1649INLINE void 1858INLINE void
1650prepare_cede (pTHX_ struct coro_transfer_args *ta) 1859prepare_cede (pTHX_ struct coro_transfer_args *ta)
1651{ 1860{
1652 api_ready (aTHX_ coro_current); 1861 api_ready (aTHX_ coro_current);
1653 prepare_schedule (aTHX_ ta); 1862 prepare_schedule (aTHX_ ta);
… …
1672{ 1881{
1673 struct coro_transfer_args ta; 1882 struct coro_transfer_args ta;
1674 1883
1675 prepare_schedule (aTHX_ &ta); 1884 prepare_schedule (aTHX_ &ta);
1676 TRANSFER (ta, 1); 1885 TRANSFER (ta, 1);
1886}
1887
1888static void
1889api_schedule_to (pTHX_ SV *coro_sv)
1890{
1891 struct coro_transfer_args ta;
1892 struct coro *next = SvSTATE (coro_sv);
1893
1894 SvREFCNT_inc_NN (coro_sv);
1895 prepare_schedule_to (aTHX_ &ta, next);
1677} 1896}
1678 1897
1679static int 1898static int
1680api_cede (pTHX) 1899api_cede (pTHX)
1681{ 1900{
… …
1710static void 1929static void
1711api_trace (pTHX_ SV *coro_sv, int flags) 1930api_trace (pTHX_ SV *coro_sv, int flags)
1712{ 1931{
1713 struct coro *coro = SvSTATE (coro_sv); 1932 struct coro *coro = SvSTATE (coro_sv);
1714 1933
1934 if (coro->flags & CF_RUNNING)
1935 croak ("cannot enable tracing on a running coroutine, caught");
1936
1715 if (flags & CC_TRACE) 1937 if (flags & CC_TRACE)
1716 { 1938 {
1717 if (!coro->cctx) 1939 if (!coro->cctx)
1718 coro->cctx = cctx_new_run (); 1940 coro->cctx = cctx_new_run ();
1719 else if (!(coro->cctx->flags & CC_TRACE)) 1941 else if (!(coro->cctx->flags & CC_TRACE))
1720 croak ("cannot enable tracing on coroutine with custom stack,"); 1942 croak ("cannot enable tracing on coroutine with custom stack, caught");
1721 1943
1722 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1944 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1723 } 1945 }
1724 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1946 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1725 { 1947 {
… …
1730 else 1952 else
1731 coro->slot->runops = RUNOPS_DEFAULT; 1953 coro->slot->runops = RUNOPS_DEFAULT;
1732 } 1954 }
1733} 1955}
1734 1956
1957static void
1958coro_call_on_destroy (pTHX_ struct coro *coro)
1959{
1960 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1961 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1962
1963 if (on_destroyp)
1964 {
1965 AV *on_destroy = (AV *)SvRV (*on_destroyp);
1966
1967 while (AvFILLp (on_destroy) >= 0)
1968 {
1969 dSP; /* don't disturb outer sp */
1970 SV *cb = av_pop (on_destroy);
1971
1972 PUSHMARK (SP);
1973
1974 if (statusp)
1975 {
1976 int i;
1977 AV *status = (AV *)SvRV (*statusp);
1978 EXTEND (SP, AvFILLp (status) + 1);
1979
1980 for (i = 0; i <= AvFILLp (status); ++i)
1981 PUSHs (AvARRAY (status)[i]);
1982 }
1983
1984 PUTBACK;
1985 call_sv (sv_2mortal (cb), G_VOID | G_DISCARD);
1986 }
1987 }
1988}
1989
1990static void
1991slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1992{
1993 int i;
1994 HV *hv = (HV *)SvRV (coro_current);
1995 AV *av = newAV ();
1996
1997 /* items are actually not so common, so optimise for this case */
1998 if (items)
1999 {
2000 av_extend (av, items - 1);
2001
2002 for (i = 0; i < items; ++i)
2003 av_push (av, SvREFCNT_inc_NN (arg [i]));
2004 }
2005
2006 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2007
2008 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
2009 api_ready (aTHX_ sv_manager);
2010
2011 frame->prepare = prepare_schedule;
2012 frame->check = slf_check_repeat;
2013
2014 /* as a minor optimisation, we could unwind all stacks here */
2015 /* but that puts extra pressure on pp_slf, and is not worth much */
2016 /*coro_unwind_stacks (aTHX);*/
2017}
2018
2019/*****************************************************************************/
2020/* async pool handler */
2021
2022static int
2023slf_check_pool_handler (pTHX_ struct CoroSLF *frame)
2024{
2025 HV *hv = (HV *)SvRV (coro_current);
2026 struct coro *coro = (struct coro *)frame->data;
2027
2028 if (!coro->invoke_cb)
2029 return 1; /* loop till we have invoke */
2030 else
2031 {
2032 hv_store (hv, "desc", sizeof ("desc") - 1,
2033 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2034
2035 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2036
2037 {
2038 dSP;
2039 XPUSHs (sv_2mortal (coro->invoke_cb)); coro->invoke_cb = 0;
2040 PUTBACK;
2041 }
2042
2043 SvREFCNT_dec (GvAV (PL_defgv));
2044 GvAV (PL_defgv) = coro->invoke_av;
2045 coro->invoke_av = 0;
2046
2047 return 0;
2048 }
2049}
2050
2051static void
2052slf_init_pool_handler (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2053{
2054 HV *hv = (HV *)SvRV (coro_current);
2055 struct coro *coro = SvSTATE_hv ((SV *)hv);
2056
2057 if (expect_true (coro->saved_deffh))
2058 {
2059 /* subsequent iteration */
2060 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2061 coro->saved_deffh = 0;
2062
2063 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2064 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2065 {
2066 coro->invoke_cb = SvREFCNT_inc_NN ((SV *)cv_coro_terminate);
2067 coro->invoke_av = newAV ();
2068
2069 frame->prepare = prepare_nop;
2070 }
2071 else
2072 {
2073 av_clear (GvAV (PL_defgv));
2074 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2075
2076 coro->prio = 0;
2077
2078 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2079 api_trace (aTHX_ coro_current, 0);
2080
2081 frame->prepare = prepare_schedule;
2082 av_push (av_async_pool, SvREFCNT_inc (hv));
2083 }
2084 }
2085 else
2086 {
2087 /* first iteration, simply fall through */
2088 frame->prepare = prepare_nop;
2089 }
2090
2091 frame->check = slf_check_pool_handler;
2092 frame->data = (void *)coro;
2093}
2094
1735/*****************************************************************************/ 2095/*****************************************************************************/
1736/* rouse callback */ 2096/* rouse callback */
1737 2097
1738#define CORO_MAGIC_type_rouse PERL_MAGIC_ext 2098#define CORO_MAGIC_type_rouse PERL_MAGIC_ext
1739 2099
1740static void 2100static void
1741coro_rouse_callback (pTHX_ CV *cv) 2101coro_rouse_callback (pTHX_ CV *cv)
1742{ 2102{
1743 dXSARGS; 2103 dXSARGS;
1744 SV *data = (SV *)GENSUB_ARG; 2104 SV *data = (SV *)S_GENSUB_ARG;
1745 2105
1746 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2106 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1747 { 2107 {
1748 /* first call, set args */ 2108 /* first call, set args */
1749 int i; 2109 SV *coro = SvRV (data);
1750 AV *av = newAV (); 2110 AV *av = newAV ();
1751 SV *coro = SvRV (data);
1752 2111
1753 SvRV_set (data, (SV *)av); 2112 SvRV_set (data, (SV *)av);
1754 api_ready (aTHX_ coro);
1755 SvREFCNT_dec (coro);
1756 2113
1757 /* better take a full copy of the arguments */ 2114 /* better take a full copy of the arguments */
1758 while (items--) 2115 while (items--)
1759 av_store (av, items, newSVsv (ST (items))); 2116 av_store (av, items, newSVsv (ST (items)));
2117
2118 api_ready (aTHX_ coro);
2119 SvREFCNT_dec (coro);
1760 } 2120 }
1761 2121
1762 XSRETURN_EMPTY; 2122 XSRETURN_EMPTY;
1763} 2123}
1764 2124
… …
1781 2141
1782 EXTEND (SP, AvFILLp (av) + 1); 2142 EXTEND (SP, AvFILLp (av) + 1);
1783 for (i = 0; i <= AvFILLp (av); ++i) 2143 for (i = 0; i <= AvFILLp (av); ++i)
1784 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2144 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1785 2145
1786 /* we have stolen the elements, so ste length to zero and free */ 2146 /* we have stolen the elements, so set length to zero and free */
1787 AvFILLp (av) = -1; 2147 AvFILLp (av) = -1;
1788 av_undef (av); 2148 av_undef (av);
1789 2149
1790 PUTBACK; 2150 PUTBACK;
1791 } 2151 }
… …
1815 || SvTYPE (SvRV (cb)) != SVt_PVCV 2175 || SvTYPE (SvRV (cb)) != SVt_PVCV
1816 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback) 2176 || CvXSUB ((CV *)SvRV (cb)) != coro_rouse_callback)
1817 croak ("Coro::rouse_wait called with illegal callback argument,"); 2177 croak ("Coro::rouse_wait called with illegal callback argument,");
1818 2178
1819 { 2179 {
1820 CV *cv = (CV *)SvRV (cb); /* for GENSUB_ARG */ 2180 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
1821 SV *data = (SV *)GENSUB_ARG; 2181 SV *data = (SV *)S_GENSUB_ARG;
1822 2182
1823 frame->data = (void *)data; 2183 frame->data = (void *)data;
1824 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2184 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule;
1825 frame->check = slf_check_rouse_wait; 2185 frame->check = slf_check_rouse_wait;
1826 } 2186 }
… …
1830coro_new_rouse_cb (pTHX) 2190coro_new_rouse_cb (pTHX)
1831{ 2191{
1832 HV *hv = (HV *)SvRV (coro_current); 2192 HV *hv = (HV *)SvRV (coro_current);
1833 struct coro *coro = SvSTATE_hv (hv); 2193 struct coro *coro = SvSTATE_hv (hv);
1834 SV *data = newRV_inc ((SV *)hv); 2194 SV *data = newRV_inc ((SV *)hv);
1835 SV *cb = gensub (aTHX_ coro_rouse_callback, (void *)data); 2195 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
1836 2196
1837 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2197 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
1838 SvREFCNT_dec (data); /* magicext increases the refcount */ 2198 SvREFCNT_dec (data); /* magicext increases the refcount */
1839 2199
1840 SvREFCNT_dec (coro->rouse_cb); 2200 SvREFCNT_dec (coro->rouse_cb);
… …
1895static void 2255static void
1896slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2256slf_init_schedule (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1897{ 2257{
1898 frame->prepare = prepare_schedule; 2258 frame->prepare = prepare_schedule;
1899 frame->check = slf_check_nop; 2259 frame->check = slf_check_nop;
2260}
2261
2262static void
2263slf_prepare_schedule_to (pTHX_ struct coro_transfer_args *ta)
2264{
2265 struct coro *next = (struct coro *)slf_frame.data;
2266
2267 SvREFCNT_inc_NN (next->hv);
2268 prepare_schedule_to (aTHX_ ta, next);
2269}
2270
2271static void
2272slf_init_schedule_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2273{
2274 if (!items)
2275 croak ("Coro::schedule_to expects a coroutine argument, caught");
2276
2277 frame->data = (void *)SvSTATE (arg [0]);
2278 frame->prepare = slf_prepare_schedule_to;
2279 frame->check = slf_check_nop;
2280}
2281
2282static void
2283slf_init_cede_to (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2284{
2285 api_ready (aTHX_ SvRV (coro_current));
2286
2287 slf_init_schedule_to (aTHX_ frame, cv, arg, items);
1900} 2288}
1901 2289
1902static void 2290static void
1903slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2291slf_init_cede (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
1904{ 2292{
… …
2037 if (PL_op->op_flags & OPf_STACKED) 2425 if (PL_op->op_flags & OPf_STACKED)
2038 { 2426 {
2039 if (items > slf_arga) 2427 if (items > slf_arga)
2040 { 2428 {
2041 slf_arga = items; 2429 slf_arga = items;
2042 free (slf_argv); 2430 Safefree (slf_argv);
2043 slf_argv = malloc (slf_arga * sizeof (SV *)); 2431 New (0, slf_argv, slf_arga, SV *);
2044 } 2432 }
2045 2433
2046 slf_argc = items; 2434 slf_argc = items;
2047 2435
2048 for (i = 0; i < items; ++i) 2436 for (i = 0; i < items; ++i)
… …
2050 } 2438 }
2051 else 2439 else
2052 slf_argc = 0; 2440 slf_argc = 0;
2053 2441
2054 PL_op->op_ppaddr = pp_slf; 2442 PL_op->op_ppaddr = pp_slf;
2055 PL_op->op_type = OP_CUSTOM; /* maybe we should leave it at entersub? */ 2443 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2056 2444
2057 PL_op = (OP *)&slf_restore; 2445 PL_op = (OP *)&slf_restore;
2446}
2447
2448/*****************************************************************************/
2449/* dynamic wind */
2450
2451static void
2452on_enterleave_call (pTHX_ SV *cb)
2453{
2454 dSP;
2455
2456 PUSHSTACK;
2457
2458 PUSHMARK (SP);
2459 PUTBACK;
2460 call_sv (cb, G_VOID | G_DISCARD);
2461 SPAGAIN;
2462
2463 POPSTACK;
2464}
2465
2466static SV *
2467coro_avp_pop_and_free (pTHX_ AV **avp)
2468{
2469 AV *av = *avp;
2470 SV *res = av_pop (av);
2471
2472 if (AvFILLp (av) < 0)
2473 {
2474 *avp = 0;
2475 SvREFCNT_dec (av);
2476 }
2477
2478 return res;
2479}
2480
2481static void
2482coro_pop_on_enter (pTHX_ void *coro)
2483{
2484 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2485 SvREFCNT_dec (cb);
2486}
2487
2488static void
2489coro_pop_on_leave (pTHX_ void *coro)
2490{
2491 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2492 on_enterleave_call (aTHX_ sv_2mortal (cb));
2058} 2493}
2059 2494
2060/*****************************************************************************/ 2495/*****************************************************************************/
2061/* PerlIO::cede */ 2496/* PerlIO::cede */
2062 2497
… …
2136/* Coro::Semaphore & Coro::Signal */ 2571/* Coro::Semaphore & Coro::Signal */
2137 2572
2138static SV * 2573static SV *
2139coro_waitarray_new (pTHX_ int count) 2574coro_waitarray_new (pTHX_ int count)
2140{ 2575{
2141 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */ 2576 /* a waitarray=semaphore contains a counter IV in $sem->[0] and any waiters after that */
2142 AV *av = newAV (); 2577 AV *av = newAV ();
2143 SV **ary; 2578 SV **ary;
2144 2579
2145 /* unfortunately, building manually saves memory */ 2580 /* unfortunately, building manually saves memory */
2146 Newx (ary, 2, SV *); 2581 Newx (ary, 2, SV *);
2147 AvALLOC (av) = ary; 2582 AvALLOC (av) = ary;
2583#if PERL_VERSION_ATLEAST (5,10,0)
2148 AvARRAY (av) = ary; 2584 AvARRAY (av) = ary;
2585#else
2586 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2587 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2588 SvPVX ((SV *)av) = (char *)ary;
2589#endif
2149 AvMAX (av) = 1; 2590 AvMAX (av) = 1;
2150 AvFILLp (av) = 0; 2591 AvFILLp (av) = 0;
2151 ary [0] = newSViv (count); 2592 ary [0] = newSViv (count);
2152 2593
2153 return newRV_noinc ((SV *)av); 2594 return newRV_noinc ((SV *)av);
… …
2173 AvARRAY (av)[0] = AvARRAY (av)[1]; 2614 AvARRAY (av)[0] = AvARRAY (av)[1];
2174 AvARRAY (av)[1] = count_sv; 2615 AvARRAY (av)[1] = count_sv;
2175 cb = av_shift (av); 2616 cb = av_shift (av);
2176 2617
2177 if (SvOBJECT (cb)) 2618 if (SvOBJECT (cb))
2619 {
2178 api_ready (aTHX_ cb); 2620 api_ready (aTHX_ cb);
2179 else 2621 --count;
2180 croak ("callbacks not yet supported"); 2622 }
2623 else if (SvTYPE (cb) == SVt_PVCV)
2624 {
2625 dSP;
2626 PUSHMARK (SP);
2627 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2628 PUTBACK;
2629 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2630 }
2181 2631
2182 SvREFCNT_dec (cb); 2632 SvREFCNT_dec (cb);
2183
2184 --count;
2185 } 2633 }
2186} 2634}
2187 2635
2188static void 2636static void
2189coro_semaphore_on_destroy (pTHX_ struct coro *coro) 2637coro_semaphore_on_destroy (pTHX_ struct coro *coro)
… …
2271} 2719}
2272 2720
2273static void 2721static void
2274slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2722slf_init_semaphore_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2275{ 2723{
2724 if (items >= 2)
2725 {
2726 /* callback form */
2727 AV *av = (AV *)SvRV (arg [0]);
2728 SV *cb_cv = s_get_cv_croak (arg [1]);
2729
2730 av_push (av, SvREFCNT_inc_NN (cb_cv));
2731
2732 if (SvIVX (AvARRAY (av)[0]) > 0)
2733 coro_semaphore_adjust (aTHX_ av, 0);
2734
2735 frame->prepare = prepare_nop;
2736 frame->check = slf_check_nop;
2737 }
2738 else
2739 {
2276 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items); 2740 slf_init_semaphore_down_or_wait (aTHX_ frame, cv, arg, items);
2277 frame->check = slf_check_semaphore_wait; 2741 frame->check = slf_check_semaphore_wait;
2742 }
2278} 2743}
2279 2744
2280/* signal */ 2745/* signal */
2281 2746
2282static void 2747static void
… …
2294 AvARRAY (av)[0] = AvARRAY (av)[1]; 2759 AvARRAY (av)[0] = AvARRAY (av)[1];
2295 AvARRAY (av)[1] = cb; 2760 AvARRAY (av)[1] = cb;
2296 2761
2297 cb = av_shift (av); 2762 cb = av_shift (av);
2298 2763
2764 if (SvTYPE (cb) == SVt_PVCV)
2765 {
2766 dSP;
2767 PUSHMARK (SP);
2768 XPUSHs (sv_2mortal (newRV_inc ((SV *)av)));
2769 PUTBACK;
2770 call_sv (cb, G_VOID | G_DISCARD | G_EVAL | G_KEEPERR);
2771 }
2772 else
2773 {
2299 api_ready (aTHX_ cb); 2774 api_ready (aTHX_ cb);
2300 sv_setiv (cb, 0); /* signal waiter */ 2775 sv_setiv (cb, 0); /* signal waiter */
2776 }
2777
2301 SvREFCNT_dec (cb); 2778 SvREFCNT_dec (cb);
2302 2779
2303 --count; 2780 --count;
2304 } 2781 }
2305} 2782}
… …
2314static void 2791static void
2315slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2792slf_init_signal_wait (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2316{ 2793{
2317 AV *av = (AV *)SvRV (arg [0]); 2794 AV *av = (AV *)SvRV (arg [0]);
2318 2795
2796 if (items >= 2)
2797 {
2798 SV *cb_cv = s_get_cv_croak (arg [1]);
2799 av_push (av, SvREFCNT_inc_NN (cb_cv));
2800
2319 if (SvIVX (AvARRAY (av)[0])) 2801 if (SvIVX (AvARRAY (av)[0]))
2802 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2803
2804 frame->prepare = prepare_nop;
2805 frame->check = slf_check_nop;
2806 }
2807 else if (SvIVX (AvARRAY (av)[0]))
2320 { 2808 {
2321 SvIVX (AvARRAY (av)[0]) = 0; 2809 SvIVX (AvARRAY (av)[0]) = 0;
2322 frame->prepare = prepare_nop; 2810 frame->prepare = prepare_nop;
2323 frame->check = slf_check_nop; 2811 frame->check = slf_check_nop;
2324 } 2812 }
2325 else 2813 else
2326 { 2814 {
2327 SV *waiter = newRV_inc (SvRV (coro_current)); /* owned by signal av */ 2815 SV *waiter = newSVsv (coro_current); /* owned by signal av */
2328 2816
2329 av_push (av, waiter); 2817 av_push (av, waiter);
2330 2818
2331 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */ 2819 frame->data = (void *)sv_2mortal (SvREFCNT_inc_NN (waiter)); /* owned by process */
2332 frame->prepare = prepare_schedule; 2820 frame->prepare = prepare_schedule;
… …
2350 2838
2351static void 2839static void
2352coro_aio_callback (pTHX_ CV *cv) 2840coro_aio_callback (pTHX_ CV *cv)
2353{ 2841{
2354 dXSARGS; 2842 dXSARGS;
2355 AV *state = (AV *)GENSUB_ARG; 2843 AV *state = (AV *)S_GENSUB_ARG;
2356 SV *coro = av_pop (state); 2844 SV *coro = av_pop (state);
2357 SV *data_sv = newSV (sizeof (struct io_state)); 2845 SV *data_sv = newSV (sizeof (struct io_state));
2358 2846
2359 av_extend (state, items); 2847 av_extend (state, items - 1);
2360 2848
2361 sv_upgrade (data_sv, SVt_PV); 2849 sv_upgrade (data_sv, SVt_PV);
2362 SvCUR_set (data_sv, sizeof (struct io_state)); 2850 SvCUR_set (data_sv, sizeof (struct io_state));
2363 SvPOK_only (data_sv); 2851 SvPOK_only (data_sv);
2364 2852
… …
2474 2962
2475 for (i = 0; i < items; ++i) 2963 for (i = 0; i < items; ++i)
2476 PUSHs (arg [i]); 2964 PUSHs (arg [i]);
2477 2965
2478 /* now push the callback closure */ 2966 /* now push the callback closure */
2479 PUSHs (sv_2mortal (gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state)))); 2967 PUSHs (sv_2mortal (s_gensub (aTHX_ coro_aio_callback, (void *)SvREFCNT_inc_NN ((SV *)state))));
2480 2968
2481 /* now call the AIO function - we assume our request is uncancelable */ 2969 /* now call the AIO function - we assume our request is uncancelable */
2482 PUTBACK; 2970 PUTBACK;
2483 call_sv ((SV *)req, G_VOID | G_DISCARD); 2971 call_sv ((SV *)req, G_VOID | G_DISCARD);
2484 } 2972 }
2485 2973
2486 /* now that the requets is going, we loop toll we have a result */ 2974 /* now that the request is going, we loop till we have a result */
2487 frame->data = (void *)state; 2975 frame->data = (void *)state;
2488 frame->prepare = prepare_schedule; 2976 frame->prepare = prepare_schedule;
2489 frame->check = slf_check_aio_req; 2977 frame->check = slf_check_aio_req;
2490} 2978}
2491 2979
… …
2498 2986
2499 XSRETURN_EMPTY; 2987 XSRETURN_EMPTY;
2500} 2988}
2501 2989
2502/*****************************************************************************/ 2990/*****************************************************************************/
2991
2992#if CORO_CLONE
2993# include "clone.c"
2994#endif
2995
2996/*****************************************************************************/
2997
2998static SV *
2999coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
3000{
3001 SV *coro_sv;
3002 struct coro *coro;
3003 MAGIC *mg;
3004 HV *hv;
3005 SV *cb;
3006 int i;
3007
3008 if (argc > 0)
3009 {
3010 cb = s_get_cv_croak (argv [0]);
3011
3012 if (!is_coro)
3013 {
3014 if (CvISXSUB (cb))
3015 croak ("Coro::State doesn't support XS functions as coroutine start, caught");
3016
3017 if (!CvROOT (cb))
3018 croak ("Coro::State doesn't support autoloaded or undefined functions as coroutine start, caught");
3019 }
3020 }
3021
3022 Newz (0, coro, 1, struct coro);
3023 coro->args = newAV ();
3024 coro->flags = CF_NEW;
3025
3026 if (coro_first) coro_first->prev = coro;
3027 coro->next = coro_first;
3028 coro_first = coro;
3029
3030 coro->hv = hv = newHV ();
3031 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
3032 mg->mg_flags |= MGf_DUP;
3033 coro_sv = sv_bless (newRV_noinc ((SV *)hv), stash);
3034
3035 if (argc > 0)
3036 {
3037 av_extend (coro->args, argc + is_coro - 1);
3038
3039 if (is_coro)
3040 {
3041 av_push (coro->args, SvREFCNT_inc_NN ((SV *)cb));
3042 cb = (SV *)cv_coro_run;
3043 }
3044
3045 coro->startcv = (CV *)SvREFCNT_inc_NN ((SV *)cb);
3046
3047 for (i = 1; i < argc; i++)
3048 av_push (coro->args, newSVsv (argv [i]));
3049 }
3050
3051 return coro_sv;
3052}
2503 3053
2504MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 3054MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
2505 3055
2506PROTOTYPES: DISABLE 3056PROTOTYPES: DISABLE
2507 3057
… …
2512 coro_thx = PERL_GET_CONTEXT; 3062 coro_thx = PERL_GET_CONTEXT;
2513# endif 3063# endif
2514#endif 3064#endif
2515 BOOT_PAGESIZE; 3065 BOOT_PAGESIZE;
2516 3066
3067 cctx_current = cctx_new_empty ();
3068
2517 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 3069 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2518 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 3070 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2519 3071
2520 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get; 3072 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2521 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set; 3073 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
… …
2540 3092
2541 { 3093 {
2542 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf))); 3094 SV *slf = sv_2mortal (newSViv (PTR2IV (pp_slf)));
2543 3095
2544 if (!PL_custom_op_names) PL_custom_op_names = newHV (); 3096 if (!PL_custom_op_names) PL_custom_op_names = newHV ();
2545 hv_store_ent (PL_custom_op_names, slf, 3097 hv_store_ent (PL_custom_op_names, slf, newSVpv ("coro_slf", 0), 0);
2546 newSVpv ("coro_slf", 0), 0);
2547 3098
2548 if (!PL_custom_op_descs) PL_custom_op_descs = newHV (); 3099 if (!PL_custom_op_descs) PL_custom_op_descs = newHV ();
2549 hv_store_ent (PL_custom_op_descs, slf, 3100 hv_store_ent (PL_custom_op_descs, slf, newSVpv ("coro schedule like function", 0), 0);
2550 newSVpv ("coro schedule like function", 0), 0);
2551 } 3101 }
2552 3102
2553 coroapi.ver = CORO_API_VERSION; 3103 coroapi.ver = CORO_API_VERSION;
2554 coroapi.rev = CORO_API_REVISION; 3104 coroapi.rev = CORO_API_REVISION;
2555 3105
… …
2567 3117
2568 if (!svp) croak ("Time::HiRes is required"); 3118 if (!svp) croak ("Time::HiRes is required");
2569 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer"); 3119 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2570 3120
2571 nvtime = INT2PTR (double (*)(), SvIV (*svp)); 3121 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3122
3123 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3124 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
2572 } 3125 }
2573 3126
2574 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 3127 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
2575} 3128}
2576 3129
2577SV * 3130SV *
2578new (char *klass, ...) 3131new (SV *klass, ...)
3132 ALIAS:
3133 Coro::new = 1
2579 CODE: 3134 CODE:
2580{ 3135 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
2581 struct coro *coro; 3136 OUTPUT:
2582 MAGIC *mg;
2583 HV *hv;
2584 int i;
2585
2586 Newz (0, coro, 1, struct coro);
2587 coro->args = newAV ();
2588 coro->flags = CF_NEW;
2589
2590 if (coro_first) coro_first->prev = coro;
2591 coro->next = coro_first;
2592 coro_first = coro;
2593
2594 coro->hv = hv = newHV ();
2595 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2596 mg->mg_flags |= MGf_DUP;
2597 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
2598
2599 av_extend (coro->args, items - 1);
2600 for (i = 1; i < items; i++)
2601 av_push (coro->args, newSVsv (ST (i)));
2602}
2603 OUTPUT:
2604 RETVAL 3137 RETVAL
2605 3138
2606void 3139void
2607transfer (...) 3140transfer (...)
2608 PROTOTYPE: $$ 3141 PROTOTYPE: $$
… …
2619void 3152void
2620_exit (int code) 3153_exit (int code)
2621 PROTOTYPE: $ 3154 PROTOTYPE: $
2622 CODE: 3155 CODE:
2623 _exit (code); 3156 _exit (code);
3157
3158SV *
3159clone (Coro::State coro)
3160 CODE:
3161{
3162#if CORO_CLONE
3163 struct coro *ncoro = coro_clone (aTHX_ coro);
3164 MAGIC *mg;
3165 /* TODO: too much duplication */
3166 ncoro->hv = newHV ();
3167 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
3168 mg->mg_flags |= MGf_DUP;
3169 RETVAL = sv_bless (newRV_noinc ((SV *)ncoro->hv), SvSTASH (coro->hv));
3170#else
3171 croak ("Coro::State->clone has not been configured into this installation of Coro, realised");
3172#endif
3173}
3174 OUTPUT:
3175 RETVAL
2624 3176
2625int 3177int
2626cctx_stacksize (int new_stacksize = 0) 3178cctx_stacksize (int new_stacksize = 0)
2627 PROTOTYPE: ;$ 3179 PROTOTYPE: ;$
2628 CODE: 3180 CODE:
… …
2678 eval = 1 3230 eval = 1
2679 CODE: 3231 CODE:
2680{ 3232{
2681 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3233 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2682 { 3234 {
2683 struct coro temp; 3235 struct coro *current = SvSTATE_current;
2684 3236
2685 if (!(coro->flags & CF_RUNNING)) 3237 if (current != coro)
2686 { 3238 {
2687 PUTBACK; 3239 PUTBACK;
2688 save_perl (aTHX_ &temp); 3240 save_perl (aTHX_ current);
2689 load_perl (aTHX_ coro); 3241 load_perl (aTHX_ coro);
3242 SPAGAIN;
2690 } 3243 }
2691 3244
2692 {
2693 dSP;
2694 ENTER;
2695 SAVETMPS;
2696 PUTBACK;
2697 PUSHSTACK; 3245 PUSHSTACK;
3246
2698 PUSHMARK (SP); 3247 PUSHMARK (SP);
3248 PUTBACK;
2699 3249
2700 if (ix) 3250 if (ix)
2701 eval_sv (coderef, 0); 3251 eval_sv (coderef, 0);
2702 else 3252 else
2703 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3253 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2704 3254
2705 POPSTACK; 3255 POPSTACK;
2706 SPAGAIN; 3256 SPAGAIN;
2707 FREETMPS;
2708 LEAVE;
2709 PUTBACK;
2710 }
2711 3257
2712 if (!(coro->flags & CF_RUNNING)) 3258 if (current != coro)
2713 { 3259 {
3260 PUTBACK;
2714 save_perl (aTHX_ coro); 3261 save_perl (aTHX_ coro);
2715 load_perl (aTHX_ &temp); 3262 load_perl (aTHX_ current);
2716 SPAGAIN; 3263 SPAGAIN;
2717 } 3264 }
2718 } 3265 }
2719} 3266}
2720 3267
… …
2724 ALIAS: 3271 ALIAS:
2725 is_ready = CF_READY 3272 is_ready = CF_READY
2726 is_running = CF_RUNNING 3273 is_running = CF_RUNNING
2727 is_new = CF_NEW 3274 is_new = CF_NEW
2728 is_destroyed = CF_DESTROYED 3275 is_destroyed = CF_DESTROYED
3276 is_suspended = CF_SUSPENDED
2729 CODE: 3277 CODE:
2730 RETVAL = boolSV (coro->flags & ix); 3278 RETVAL = boolSV (coro->flags & ix);
2731 OUTPUT: 3279 OUTPUT:
2732 RETVAL 3280 RETVAL
2733 3281
2734void 3282void
2735throw (Coro::State self, SV *throw = &PL_sv_undef) 3283throw (Coro::State self, SV *exception = &PL_sv_undef)
2736 PROTOTYPE: $;$ 3284 PROTOTYPE: $;$
2737 CODE: 3285 CODE:
2738{ 3286{
2739 struct coro *current = SvSTATE_current; 3287 struct coro *current = SvSTATE_current;
2740 SV **throwp = self == current ? &CORO_THROW : &self->except; 3288 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
2741 SvREFCNT_dec (*throwp); 3289 SvREFCNT_dec (*exceptionp);
2742 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3290 SvGETMAGIC (exception);
3291 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
2743} 3292}
2744 3293
2745void 3294void
2746api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3295api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2747 PROTOTYPE: $;$ 3296 PROTOTYPE: $;$
… …
2749 3298
2750SV * 3299SV *
2751has_cctx (Coro::State coro) 3300has_cctx (Coro::State coro)
2752 PROTOTYPE: $ 3301 PROTOTYPE: $
2753 CODE: 3302 CODE:
2754 RETVAL = boolSV (!!coro->cctx); 3303 /* maybe manage the running flag differently */
3304 RETVAL = boolSV (!!coro->cctx || (coro->flags & CF_RUNNING));
2755 OUTPUT: 3305 OUTPUT:
2756 RETVAL 3306 RETVAL
2757 3307
2758int 3308int
2759is_traced (Coro::State coro) 3309is_traced (Coro::State coro)
… …
2779 3329
2780void 3330void
2781force_cctx () 3331force_cctx ()
2782 PROTOTYPE: 3332 PROTOTYPE:
2783 CODE: 3333 CODE:
2784 SvSTATE_current->cctx->idle_sp = 0; 3334 cctx_current->idle_sp = 0;
2785 3335
2786void 3336void
2787swap_defsv (Coro::State self) 3337swap_defsv (Coro::State self)
2788 PROTOTYPE: $ 3338 PROTOTYPE: $
2789 ALIAS: 3339 ALIAS:
… …
2797 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3347 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2798 3348
2799 SV *tmp = *src; *src = *dst; *dst = tmp; 3349 SV *tmp = *src; *src = *dst; *dst = tmp;
2800 } 3350 }
2801 3351
3352void
3353cancel (Coro::State self)
3354 CODE:
3355 coro_state_destroy (aTHX_ self);
3356 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3357
3358
3359SV *
3360enable_times (int enabled = enable_times)
3361 CODE:
3362{
3363 RETVAL = boolSV (enable_times);
3364
3365 if (enabled != enable_times)
3366 {
3367 enable_times = enabled;
3368
3369 coro_times_update ();
3370 (enabled ? coro_times_sub : coro_times_add)(SvSTATE (coro_current));
3371 }
3372}
3373 OUTPUT:
3374 RETVAL
3375
3376void
3377times (Coro::State self)
3378 PPCODE:
3379{
3380 struct coro *current = SvSTATE (coro_current);
3381
3382 if (expect_false (current == self))
3383 {
3384 coro_times_update ();
3385 coro_times_add (SvSTATE (coro_current));
3386 }
3387
3388 EXTEND (SP, 2);
3389 PUSHs (sv_2mortal (newSVnv (self->t_real [0] + self->t_real [1] * 1e-9)));
3390 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3391
3392 if (expect_false (current == self))
3393 coro_times_sub (SvSTATE (coro_current));
3394}
3395
3396void
3397swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3398 CODE:
3399{
3400 struct coro *current = SvSTATE_current;
3401
3402 if (current == coro)
3403 SWAP_SVS (current);
3404
3405 if (!coro->swap_sv)
3406 coro->swap_sv = newAV ();
3407
3408 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3409 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3410
3411 if (current == coro)
3412 SWAP_SVS (current);
3413}
3414
2802 3415
2803MODULE = Coro::State PACKAGE = Coro 3416MODULE = Coro::State PACKAGE = Coro
2804 3417
2805BOOT: 3418BOOT:
2806{ 3419{
2807 int i;
2808
2809 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2810 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3420 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2811 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3421 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2812 3422 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3423 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
2813 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE); 3424 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
2814 SvREADONLY_on (coro_current); 3425 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3426 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3427 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3428 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
2815 3429
3430 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3431 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3432 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3433 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3434
2816 coro_stash = gv_stashpv ("Coro", TRUE); 3435 coro_stash = gv_stashpv ("Coro", TRUE);
2817 3436
2818 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 3437 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
2819 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3438 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
2820 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3439 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
2821 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3440 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (CORO_PRIO_LOW));
2822 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3441 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (CORO_PRIO_IDLE));
2823 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3442 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (CORO_PRIO_MIN));
2824
2825 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
2826 coro_ready[i] = newAV ();
2827 3443
2828 { 3444 {
2829 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3445 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
2830 3446
2831 coroapi.schedule = api_schedule; 3447 coroapi.schedule = api_schedule;
3448 coroapi.schedule_to = api_schedule_to;
2832 coroapi.cede = api_cede; 3449 coroapi.cede = api_cede;
2833 coroapi.cede_notself = api_cede_notself; 3450 coroapi.cede_notself = api_cede_notself;
2834 coroapi.ready = api_ready; 3451 coroapi.ready = api_ready;
2835 coroapi.is_ready = api_is_ready; 3452 coroapi.is_ready = api_is_ready;
2836 coroapi.nready = coro_nready; 3453 coroapi.nready = coro_nready;
… …
2840 sv_setiv (sv, (IV)&coroapi); 3457 sv_setiv (sv, (IV)&coroapi);
2841 SvREADONLY_on (sv); 3458 SvREADONLY_on (sv);
2842 } 3459 }
2843} 3460}
2844 3461
3462SV *
3463async (...)
3464 PROTOTYPE: &@
3465 CODE:
3466 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3467 api_ready (aTHX_ RETVAL);
3468 OUTPUT:
3469 RETVAL
3470
3471void
3472terminate (...)
3473 CODE:
3474 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3475
2845void 3476void
2846schedule (...) 3477schedule (...)
2847 CODE: 3478 CODE:
2848 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3479 CORO_EXECUTE_SLF_XS (slf_init_schedule);
3480
3481void
3482schedule_to (...)
3483 CODE:
3484 CORO_EXECUTE_SLF_XS (slf_init_schedule_to);
3485
3486void
3487cede_to (...)
3488 CODE:
3489 CORO_EXECUTE_SLF_XS (slf_init_cede_to);
2849 3490
2850void 3491void
2851cede (...) 3492cede (...)
2852 CODE: 3493 CODE:
2853 CORO_EXECUTE_SLF_XS (slf_init_cede); 3494 CORO_EXECUTE_SLF_XS (slf_init_cede);
… …
2867void 3508void
2868_set_readyhook (SV *hook) 3509_set_readyhook (SV *hook)
2869 PROTOTYPE: $ 3510 PROTOTYPE: $
2870 CODE: 3511 CODE:
2871 SvREFCNT_dec (coro_readyhook); 3512 SvREFCNT_dec (coro_readyhook);
3513 SvGETMAGIC (hook);
3514 if (SvOK (hook))
3515 {
2872 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0; 3516 coro_readyhook = newSVsv (hook);
3517 CORO_READYHOOK = invoke_sv_ready_hook_helper;
3518 }
3519 else
3520 {
3521 coro_readyhook = 0;
3522 CORO_READYHOOK = 0;
3523 }
2873 3524
2874int 3525int
2875prio (Coro::State coro, int newprio = 0) 3526prio (Coro::State coro, int newprio = 0)
2876 PROTOTYPE: $;$ 3527 PROTOTYPE: $;$
2877 ALIAS: 3528 ALIAS:
… …
2883 if (items > 1) 3534 if (items > 1)
2884 { 3535 {
2885 if (ix) 3536 if (ix)
2886 newprio = coro->prio - newprio; 3537 newprio = coro->prio - newprio;
2887 3538
2888 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 3539 if (newprio < CORO_PRIO_MIN) newprio = CORO_PRIO_MIN;
2889 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 3540 if (newprio > CORO_PRIO_MAX) newprio = CORO_PRIO_MAX;
2890 3541
2891 coro->prio = newprio; 3542 coro->prio = newprio;
2892 } 3543 }
2893} 3544}
2894 OUTPUT: 3545 OUTPUT:
… …
2908 CODE: 3559 CODE:
2909 RETVAL = coro_nready; 3560 RETVAL = coro_nready;
2910 OUTPUT: 3561 OUTPUT:
2911 RETVAL 3562 RETVAL
2912 3563
2913# for async_pool speedup
2914void 3564void
2915_pool_1 (SV *cb) 3565suspend (Coro::State self)
3566 PROTOTYPE: $
2916 CODE: 3567 CODE:
2917{ 3568 self->flags |= CF_SUSPENDED;
2918 HV *hv = (HV *)SvRV (coro_current);
2919 struct coro *coro = SvSTATE_hv ((SV *)hv);
2920 AV *defav = GvAV (PL_defgv);
2921 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2922 AV *invoke_av;
2923 int i, len;
2924 3569
2925 if (!invoke) 3570void
3571resume (Coro::State self)
3572 PROTOTYPE: $
3573 CODE:
3574 self->flags &= ~CF_SUSPENDED;
3575
3576void
3577_pool_handler (...)
3578 CODE:
3579 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3580
3581void
3582async_pool (SV *cv, ...)
3583 PROTOTYPE: &@
3584 PPCODE:
3585{
3586 HV *hv = (HV *)av_pop (av_async_pool);
3587 AV *av = newAV ();
3588 SV *cb = ST (0);
3589 int i;
3590
3591 av_extend (av, items - 2);
3592 for (i = 1; i < items; ++i)
3593 av_push (av, SvREFCNT_inc_NN (ST (i)));
3594
3595 if ((SV *)hv == &PL_sv_undef)
2926 { 3596 {
2927 SV *old = PL_diehook; 3597 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
2928 PL_diehook = 0; 3598 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
2929 SvREFCNT_dec (old); 3599 SvREFCNT_dec (sv);
2930 croak ("\3async_pool terminate\2\n");
2931 } 3600 }
2932 3601
2933 SvREFCNT_dec (coro->saved_deffh);
2934 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2935
2936 hv_store (hv, "desc", sizeof ("desc") - 1,
2937 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2938
2939 invoke_av = (AV *)SvRV (invoke);
2940 len = av_len (invoke_av);
2941
2942 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2943
2944 if (len > 0)
2945 { 3602 {
2946 av_fill (defav, len - 1); 3603 struct coro *coro = SvSTATE_hv (hv);
2947 for (i = 0; i < len; ++i) 3604
2948 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1])); 3605 assert (!coro->invoke_cb);
3606 assert (!coro->invoke_av);
3607 coro->invoke_cb = SvREFCNT_inc (cb);
3608 coro->invoke_av = av;
2949 } 3609 }
2950}
2951 3610
2952void 3611 api_ready (aTHX_ (SV *)hv);
2953_pool_2 (SV *cb)
2954 CODE:
2955{
2956 HV *hv = (HV *)SvRV (coro_current);
2957 struct coro *coro = SvSTATE_hv ((SV *)hv);
2958 3612
2959 sv_setsv (cb, &PL_sv_undef); 3613 if (GIMME_V != G_VOID)
2960 3614 XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
2961 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 3615 else
2962 coro->saved_deffh = 0;
2963
2964 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2965 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2966 {
2967 SV *old = PL_diehook;
2968 PL_diehook = 0;
2969 SvREFCNT_dec (old); 3616 SvREFCNT_dec (hv);
2970 croak ("\3async_pool terminate\2\n");
2971 }
2972
2973 av_clear (GvAV (PL_defgv));
2974 hv_store (hv, "desc", sizeof ("desc") - 1,
2975 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2976
2977 coro->prio = 0;
2978
2979 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2980 api_trace (aTHX_ coro_current, 0);
2981
2982 av_push (av_async_pool, newSVsv (coro_current));
2983} 3617}
2984 3618
2985SV * 3619SV *
2986rouse_cb () 3620rouse_cb ()
2987 PROTOTYPE: 3621 PROTOTYPE:
… …
2989 RETVAL = coro_new_rouse_cb (aTHX); 3623 RETVAL = coro_new_rouse_cb (aTHX);
2990 OUTPUT: 3624 OUTPUT:
2991 RETVAL 3625 RETVAL
2992 3626
2993void 3627void
2994rouse_wait (SV *cb = 0) 3628rouse_wait (...)
2995 PROTOTYPE: ;$ 3629 PROTOTYPE: ;$
2996 PPCODE: 3630 PPCODE:
2997 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3631 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
2998 3632
3633void
3634on_enter (SV *block)
3635 ALIAS:
3636 on_leave = 1
3637 PROTOTYPE: &
3638 CODE:
3639{
3640 struct coro *coro = SvSTATE_current;
3641 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3642
3643 block = s_get_cv_croak (block);
3644
3645 if (!*avp)
3646 *avp = newAV ();
3647
3648 av_push (*avp, SvREFCNT_inc (block));
3649
3650 if (!ix)
3651 on_enterleave_call (aTHX_ block);
3652
3653 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3654 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3655 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3656}
3657
2999 3658
3000MODULE = Coro::State PACKAGE = PerlIO::cede 3659MODULE = Coro::State PACKAGE = PerlIO::cede
3001 3660
3002BOOT: 3661BOOT:
3003 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3662 PerlIO_define_layer (aTHX_ &PerlIO_cede);
… …
3006MODULE = Coro::State PACKAGE = Coro::Semaphore 3665MODULE = Coro::State PACKAGE = Coro::Semaphore
3007 3666
3008SV * 3667SV *
3009new (SV *klass, SV *count = 0) 3668new (SV *klass, SV *count = 0)
3010 CODE: 3669 CODE:
3670{
3671 int semcnt = 1;
3672
3673 if (count)
3674 {
3675 SvGETMAGIC (count);
3676
3677 if (SvOK (count))
3678 semcnt = SvIV (count);
3679 }
3680
3011 RETVAL = sv_bless ( 3681 RETVAL = sv_bless (
3012 coro_waitarray_new (aTHX_ count && SvOK (count) ? SvIV (count) : 1), 3682 coro_waitarray_new (aTHX_ semcnt),
3013 GvSTASH (CvGV (cv)) 3683 GvSTASH (CvGV (cv))
3014 ); 3684 );
3685}
3015 OUTPUT: 3686 OUTPUT:
3016 RETVAL 3687 RETVAL
3017 3688
3018# helper for Coro::Channel 3689# helper for Coro::Channel and others
3019SV * 3690SV *
3020_alloc (int count) 3691_alloc (int count)
3021 CODE: 3692 CODE:
3022 RETVAL = coro_waitarray_new (aTHX_ count); 3693 RETVAL = coro_waitarray_new (aTHX_ count);
3023 OUTPUT: 3694 OUTPUT:
… …
3036 adjust = 1 3707 adjust = 1
3037 CODE: 3708 CODE:
3038 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1); 3709 coro_semaphore_adjust (aTHX_ (AV *)SvRV (self), ix ? adjust : 1);
3039 3710
3040void 3711void
3041down (SV *self) 3712down (...)
3042 CODE: 3713 CODE:
3043 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down); 3714 CORO_EXECUTE_SLF_XS (slf_init_semaphore_down);
3044 3715
3045void 3716void
3046wait (SV *self) 3717wait (...)
3047 CODE: 3718 CODE:
3048 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait); 3719 CORO_EXECUTE_SLF_XS (slf_init_semaphore_wait);
3049 3720
3050void 3721void
3051try (SV *self) 3722try (SV *self)
… …
3081 for (i = 1; i <= wcount; ++i) 3752 for (i = 1; i <= wcount; ++i)
3082 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3753 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3083 } 3754 }
3084} 3755}
3085 3756
3757MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3758
3759void
3760_may_delete (SV *sem, int count, int extra_refs)
3761 PPCODE:
3762{
3763 AV *av = (AV *)SvRV (sem);
3764
3765 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3766 && AvFILLp (av) == 0 /* no waiters, just count */
3767 && SvIV (AvARRAY (av)[0]) == count)
3768 XSRETURN_YES;
3769
3770 XSRETURN_NO;
3771}
3772
3086MODULE = Coro::State PACKAGE = Coro::Signal 3773MODULE = Coro::State PACKAGE = Coro::Signal
3087 3774
3088SV * 3775SV *
3089new (SV *klass) 3776new (SV *klass)
3090 CODE: 3777 CODE:
… …
3094 ); 3781 );
3095 OUTPUT: 3782 OUTPUT:
3096 RETVAL 3783 RETVAL
3097 3784
3098void 3785void
3099wait (SV *self) 3786wait (...)
3100 CODE: 3787 CODE:
3101 CORO_EXECUTE_SLF_XS (slf_init_signal_wait); 3788 CORO_EXECUTE_SLF_XS (slf_init_signal_wait);
3102 3789
3103void 3790void
3104broadcast (SV *self) 3791broadcast (SV *self)
… …
3161 3848
3162void 3849void
3163_register (char *target, char *proto, SV *req) 3850_register (char *target, char *proto, SV *req)
3164 CODE: 3851 CODE:
3165{ 3852{
3166 HV *st; 3853 SV *req_cv = s_get_cv_croak (req);
3167 GV *gvp;
3168 CV *req_cv = sv_2cv (req, &st, &gvp, 0);
3169 /* newXSproto doesn't return the CV on 5.8 */ 3854 /* newXSproto doesn't return the CV on 5.8 */
3170 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__); 3855 CV *slf_cv = newXS (target, coro_aio_req_xs, __FILE__);
3171 sv_setpv ((SV *)slf_cv, proto); 3856 sv_setpv ((SV *)slf_cv, proto);
3172 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0); 3857 sv_magicext ((SV *)slf_cv, (SV *)req_cv, CORO_MAGIC_type_aio, 0, 0, 0);
3173} 3858}
3174 3859
3860MODULE = Coro::State PACKAGE = Coro::Select
3861
3862void
3863patch_pp_sselect ()
3864 CODE:
3865 if (!coro_old_pp_sselect)
3866 {
3867 coro_select_select = (SV *)get_cv ("Coro::Select::select", 0);
3868 coro_old_pp_sselect = PL_ppaddr [OP_SSELECT];
3869 PL_ppaddr [OP_SSELECT] = coro_pp_sselect;
3870 }
3871
3872void
3873unpatch_pp_sselect ()
3874 CODE:
3875 if (coro_old_pp_sselect)
3876 {
3877 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3878 coro_old_pp_sselect = 0;
3879 }
3880

Diff Legend

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