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.139 by root, Sun Jan 14 21:13:41 2007 UTC vs.
Revision 1.274 by root, Sat Nov 15 00:08:30 2008 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2
3#define PERL_NO_GET_CONTEXT
4#define PERL_EXT
2 5
3#include "EXTERN.h" 6#include "EXTERN.h"
4#include "perl.h" 7#include "perl.h"
5#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h"
6 10
7#include "patchlevel.h" 11#include "patchlevel.h"
8 12
9#include <stdio.h> 13#include <stdio.h>
10#include <errno.h> 14#include <errno.h>
11#include <assert.h> 15#include <assert.h>
16
17#ifdef WIN32
18# undef setjmp
19# undef longjmp
20# undef _exit
21# define setjmp _setjmp // deep magic, don't ask
22#else
23# include <inttypes.h> /* most portable stdint.h */
24#endif
12 25
13#ifdef HAVE_MMAP 26#ifdef HAVE_MMAP
14# include <unistd.h> 27# include <unistd.h>
15# include <sys/mman.h> 28# include <sys/mman.h>
16# ifndef MAP_ANONYMOUS 29# ifndef MAP_ANONYMOUS
… …
31#else 44#else
32# define PAGESIZE 0 45# define PAGESIZE 0
33# define BOOT_PAGESIZE (void)0 46# define BOOT_PAGESIZE (void)0
34#endif 47#endif
35 48
36#if USE_VALGRIND 49#if CORO_USE_VALGRIND
37# include <valgrind/valgrind.h> 50# include <valgrind/valgrind.h>
38#endif 51#endif
39 52
40/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
41#define MAX_IDLE_CCTX 8 54static int cctx_max_idle = 4;
42 55
43#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
44 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
45 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
46 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
… …
65# ifndef IS_PADCONST 78# ifndef IS_PADCONST
66# define IS_PADCONST(v) 0 79# define IS_PADCONST(v) 0
67# endif 80# endif
68#endif 81#endif
69 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
70/* 5.8.7 */ 101/* 5.8.7 */
71#ifndef SvRV_set 102#ifndef SvRV_set
72# define SvRV_set(s,v) SvRV(s) = (v) 103# define SvRV_set(s,v) SvRV(s) = (v)
73#endif 104#endif
74 105
75#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 106#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
76# undef STACKGUARD 107# undef CORO_STACKGUARD
77#endif 108#endif
78 109
79#ifndef STACKGUARD 110#ifndef CORO_STACKGUARD
80# define STACKGUARD 0 111# define CORO_STACKGUARD 0
81#endif 112#endif
82 113
83/* prefer perl internal functions over our own? */ 114/* prefer perl internal functions over our own? */
84#ifndef PREFER_PERL_FUNCTIONS 115#ifndef CORO_PREFER_PERL_FUNCTIONS
85# define PREFER_PERL_FUNCTIONS 0 116# define CORO_PREFER_PERL_FUNCTIONS 0
86#endif 117#endif
87 118
88/* The next macro should declare a variable stacklevel that contains and approximation 119/* The next macros try to return the current stack pointer, in an as
89 * to the current C stack pointer. Its property is that it changes with each call 120 * portable way as possible. */
90 * and should be unique. */ 121#if __GNUC__ >= 4
91#define dSTACKLEVEL int stacklevel 122# define dSTACKLEVEL void *stacklevel = __builtin_frame_address (0)
92#define STACKLEVEL ((void *)&stacklevel) 123#else
124# define dSTACKLEVEL volatile void *stacklevel = (volatile void *)&stacklevel
125#endif
93 126
94#define IN_DESTRUCT (PL_main_cv == Nullcv) 127#define IN_DESTRUCT (PL_main_cv == Nullcv)
95 128
96#if __GNUC__ >= 3 129#if __GNUC__ >= 3
97# define attribute(x) __attribute__(x) 130# define attribute(x) __attribute__(x)
98# define BARRIER __asm__ __volatile__ ("" : : : "memory") 131# define expect(expr,value) __builtin_expect ((expr),(value))
132# define INLINE static inline
99#else 133#else
100# define attribute(x) 134# define attribute(x)
101# define BARRIER 135# define expect(expr,value) (expr)
136# define INLINE static
102#endif 137#endif
138
139#define expect_false(expr) expect ((expr) != 0, 0)
140#define expect_true(expr) expect ((expr) != 0, 1)
103 141
104#define NOINLINE attribute ((noinline)) 142#define NOINLINE attribute ((noinline))
105 143
106#include "CoroAPI.h" 144#include "CoroAPI.h"
107 145
108#ifdef USE_ITHREADS 146#ifdef USE_ITHREADS
147
109static perl_mutex coro_mutex; 148static perl_mutex coro_lock;
110# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 149# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0)
111# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 150# define UNLOCK do { MUTEX_UNLOCK (&coro_lock); } while (0)
151# if CORO_PTHREAD
152static void *coro_thx;
153# endif
154
112#else 155#else
156
113# define LOCK (void)0 157# define LOCK (void)0
114# define UNLOCK (void)0 158# define UNLOCK (void)0
159
115#endif 160#endif
161
162# undef LOCK
163# define LOCK (void)0
164# undef UNLOCK
165# define UNLOCK (void)0
116 166
117/* helper storage struct for Coro::AIO */ 167/* helper storage struct for Coro::AIO */
118struct io_state 168struct io_state
119{ 169{
170 AV *res;
120 int errorno; 171 int errorno;
121 I32 laststype; 172 I32 laststype; /* U16 in 5.10.0 */
122 int laststatval; 173 int laststatval;
123 Stat_t statcache; 174 Stat_t statcache;
124}; 175};
125 176
177static double (*nvtime)(); /* so why doesn't it take void? */
178
179static U32 cctx_gen;
180static size_t cctx_stacksize = CORO_STACKSIZE;
126static struct CoroAPI coroapi; 181static struct CoroAPI coroapi;
127static AV *main_mainstack; /* used to differentiate between $main and others */ 182static AV *main_mainstack; /* used to differentiate between $main and others */
183static JMPENV *main_top_env;
128static HV *coro_state_stash, *coro_stash; 184static HV *coro_state_stash, *coro_stash;
129static SV *coro_mortal; /* will be freed after next transfer */ 185static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
186static volatile struct coro *transfer_next;
187
188static GV *irsgv; /* $/ */
189static GV *stdoutgv; /* *STDOUT */
190static SV *rv_diehook;
191static SV *rv_warnhook;
192static HV *hv_sig; /* %SIG */
193
194/* async_pool helper stuff */
195static SV *sv_pool_rss;
196static SV *sv_pool_size;
197static AV *av_async_pool;
198
199/* Coro::AnyEvent */
200static SV *sv_activity;
130 201
131static struct coro_cctx *cctx_first; 202static struct coro_cctx *cctx_first;
132static int cctx_count, cctx_idle; 203static int cctx_count, cctx_idle;
133 204
205enum {
206 CC_MAPPED = 0x01,
207 CC_NOREUSE = 0x02, /* throw this away after tracing */
208 CC_TRACE = 0x04,
209 CC_TRACE_SUB = 0x08, /* trace sub calls */
210 CC_TRACE_LINE = 0x10, /* trace each statement */
211 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
212};
213
134/* this is a structure representing a c-level coroutine */ 214/* this is a structure representing a c-level coroutine */
135typedef struct coro_cctx { 215typedef struct coro_cctx
216{
136 struct coro_cctx *next; 217 struct coro_cctx *next;
137 218
138 /* the stack */ 219 /* the stack */
139 void *sptr; 220 void *sptr;
140 long ssize; /* positive == mmap, otherwise malloc */ 221 size_t ssize;
141 222
142 /* cpu state */ 223 /* cpu state */
143 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 224 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
144 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 225 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
145 JMPENV *top_env; 226 JMPENV *top_env;
146 coro_context cctx; 227 coro_context cctx;
147 228
148 int inuse; 229 U32 gen;
149
150#if USE_VALGRIND 230#if CORO_USE_VALGRIND
151 int valgrind_id; 231 int valgrind_id;
152#endif 232#endif
233 unsigned char flags;
153} coro_cctx; 234} coro_cctx;
154 235
155enum { 236enum {
156 CF_RUNNING = 0x0001, /* coroutine is running */ 237 CF_RUNNING = 0x0001, /* coroutine is running */
157 CF_READY = 0x0002, /* coroutine is ready */ 238 CF_READY = 0x0002, /* coroutine is ready */
158 CF_NEW = 0x0004, /* has never been switched to */ 239 CF_NEW = 0x0004, /* has never been switched to */
159 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 240 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
160}; 241};
161 242
162/* this is a structure representing a perl-level coroutine */ 243/* the structure where most of the perl state is stored, overlaid on the cxstack */
163struct coro { 244typedef struct
164 /* the c coroutine allocated to this perl coroutine, if any */ 245{
165 coro_cctx *cctx; 246 SV *defsv;
166 247 AV *defav;
167 /* data associated with this coroutine (initial args) */ 248 SV *errsv;
168 AV *args; 249 SV *irsgv;
169 int refcnt;
170 int save; /* CORO_SAVE flags */
171 int flags; /* CF_ flags */
172
173 /* optionally saved, might be zero */
174 AV *defav; /* @_ */
175 SV *defsv; /* $_ */
176 SV *errsv; /* $@ */
177 SV *irssv; /* $/ */
178 SV *irssv_sv; /* real $/ cache */
179
180#define VAR(name,type) type name; 250#define VAR(name,type) type name;
181# include "state.h" 251# include "state.h"
182#undef VAR 252#undef VAR
253} perl_slots;
254
255#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
256
257/* this is a structure representing a perl-level coroutine */
258struct coro {
259 /* the C coroutine allocated to this perl coroutine, if any */
260 coro_cctx *cctx;
261
262 /* process data */
263 struct CoroSLF slf_frame; /* saved slf frame */
264 AV *mainstack;
265 perl_slots *slot; /* basically the saved sp */
266
267 AV *args; /* data associated with this coroutine (initial args) */
268 int refcnt; /* coroutines are refcounted, yes */
269 int flags; /* CF_ flags */
270 HV *hv; /* the perl hash associated with this coro, if any */
271
272 /* statistics */
273 int usecount; /* number of transfers to this coro */
183 274
184 /* coro process data */ 275 /* coro process data */
185 int prio; 276 int prio;
277 SV *throw; /* exception to be thrown */
278
279 /* async_pool */
280 SV *saved_deffh;
281
282 /* linked list */
283 struct coro *next, *prev;
186}; 284};
187 285
188typedef struct coro *Coro__State; 286typedef struct coro *Coro__State;
189typedef struct coro *Coro__State_or_hashref; 287typedef struct coro *Coro__State_or_hashref;
288
289static struct CoroSLF slf_frame; /* the current slf frame */
190 290
191/** Coro ********************************************************************/ 291/** Coro ********************************************************************/
192 292
193#define PRIO_MAX 3 293#define PRIO_MAX 3
194#define PRIO_HIGH 1 294#define PRIO_HIGH 1
… …
197#define PRIO_IDLE -3 297#define PRIO_IDLE -3
198#define PRIO_MIN -4 298#define PRIO_MIN -4
199 299
200/* for Coro.pm */ 300/* for Coro.pm */
201static SV *coro_current; 301static SV *coro_current;
302static SV *coro_readyhook;
202static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 303static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
203static int coro_nready; 304static struct coro *coro_first;
305#define coro_nready coroapi.nready
204 306
205/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
206 308
309static SV *
310coro_get_sv (pTHX_ const char *name, int create)
311{
312#if PERL_VERSION_ATLEAST (5,10,0)
313 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
314 get_sv (name, create);
315#endif
316 return get_sv (name, create);
317}
318
207static AV * 319static AV *
320coro_get_av (pTHX_ const char *name, int create)
321{
322#if PERL_VERSION_ATLEAST (5,10,0)
323 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
324 get_av (name, create);
325#endif
326 return get_av (name, create);
327}
328
329static HV *
330coro_get_hv (pTHX_ const char *name, int create)
331{
332#if PERL_VERSION_ATLEAST (5,10,0)
333 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
334 get_hv (name, create);
335#endif
336 return get_hv (name, create);
337}
338
339static AV *
208coro_clone_padlist (CV *cv) 340coro_clone_padlist (pTHX_ CV *cv)
209{ 341{
210 AV *padlist = CvPADLIST (cv); 342 AV *padlist = CvPADLIST (cv);
211 AV *newpadlist, *newpad; 343 AV *newpadlist, *newpad;
212 344
213 newpadlist = newAV (); 345 newpadlist = newAV ();
214 AvREAL_off (newpadlist); 346 AvREAL_off (newpadlist);
215#if PERL_VERSION_ATLEAST (5,9,0) 347#if PERL_VERSION_ATLEAST (5,10,0)
216 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 348 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
217#else 349#else
218 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 350 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
219#endif 351#endif
220 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 352 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
221 --AvFILLp (padlist); 353 --AvFILLp (padlist);
222 354
223 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 355 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
224 av_store (newpadlist, 1, (SV *)newpad); 356 av_store (newpadlist, 1, (SV *)newpad);
225 357
226 return newpadlist; 358 return newpadlist;
227} 359}
228 360
229static void 361static void
230free_padlist (AV *padlist) 362free_padlist (pTHX_ AV *padlist)
231{ 363{
232 /* may be during global destruction */ 364 /* may be during global destruction */
233 if (SvREFCNT (padlist)) 365 if (SvREFCNT (padlist))
234 { 366 {
235 I32 i = AvFILLp (padlist); 367 I32 i = AvFILLp (padlist);
… …
256 AV *padlist; 388 AV *padlist;
257 AV *av = (AV *)mg->mg_obj; 389 AV *av = (AV *)mg->mg_obj;
258 390
259 /* casting is fun. */ 391 /* casting is fun. */
260 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 392 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
261 free_padlist (padlist); 393 free_padlist (aTHX_ padlist);
262 394
263 SvREFCNT_dec (av); 395 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
264 396
265 return 0; 397 return 0;
266} 398}
267 399
268#define PERL_MAGIC_coro PERL_MAGIC_ext 400#define CORO_MAGIC_type_cv PERL_MAGIC_ext
401#define CORO_MAGIC_type_state PERL_MAGIC_ext
269 402
270static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 403static MGVTBL coro_cv_vtbl = {
404 0, 0, 0, 0,
405 coro_cv_free
406};
271 407
272#define CORO_MAGIC(cv) \ 408#define CORO_MAGIC(sv, type) \
273 SvMAGIC (cv) \ 409 SvMAGIC (sv) \
274 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 410 ? SvMAGIC (sv)->mg_type == type \
275 ? SvMAGIC (cv) \ 411 ? SvMAGIC (sv) \
276 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 412 : mg_find (sv, type) \
277 : 0 413 : 0
414
415#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
416#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
417
418INLINE struct coro *
419SvSTATE_ (pTHX_ SV *coro)
420{
421 HV *stash;
422 MAGIC *mg;
423
424 if (SvROK (coro))
425 coro = SvRV (coro);
426
427 if (expect_false (SvTYPE (coro) != SVt_PVHV))
428 croak ("Coro::State object required");
429
430 stash = SvSTASH (coro);
431 if (expect_false (stash != coro_stash && stash != coro_state_stash))
432 {
433 /* very slow, but rare, check */
434 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
435 croak ("Coro::State object required");
436 }
437
438 mg = CORO_MAGIC_state (coro);
439 return (struct coro *)mg->mg_ptr;
440}
441
442#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
278 443
279/* the next two functions merely cache the padlists */ 444/* the next two functions merely cache the padlists */
280static void 445static void
281get_padlist (CV *cv) 446get_padlist (pTHX_ CV *cv)
282{ 447{
283 MAGIC *mg = CORO_MAGIC (cv); 448 MAGIC *mg = CORO_MAGIC_cv (cv);
284 AV *av; 449 AV *av;
285 450
286 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 451 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
287 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 452 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
288 else 453 else
289 { 454 {
290#if PREFER_PERL_FUNCTIONS 455#if CORO_PREFER_PERL_FUNCTIONS
291 /* this is probably cleaner, but also slower? */ 456 /* this is probably cleaner? but also slower! */
457 /* in practise, it seems to be less stable */
292 CV *cp = Perl_cv_clone (cv); 458 CV *cp = Perl_cv_clone (cv);
293 CvPADLIST (cv) = CvPADLIST (cp); 459 CvPADLIST (cv) = CvPADLIST (cp);
294 CvPADLIST (cp) = 0; 460 CvPADLIST (cp) = 0;
295 SvREFCNT_dec (cp); 461 SvREFCNT_dec (cp);
296#else 462#else
297 CvPADLIST (cv) = coro_clone_padlist (cv); 463 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
298#endif 464#endif
299 } 465 }
300} 466}
301 467
302static void 468static void
303put_padlist (CV *cv) 469put_padlist (pTHX_ CV *cv)
304{ 470{
305 MAGIC *mg = CORO_MAGIC (cv); 471 MAGIC *mg = CORO_MAGIC_cv (cv);
306 AV *av; 472 AV *av;
307 473
308 if (!mg) 474 if (expect_false (!mg))
309 { 475 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
310 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
311 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
312 mg->mg_virtual = &vtbl_coro;
313 mg->mg_obj = (SV *)newAV ();
314 }
315 476
316 av = (AV *)mg->mg_obj; 477 av = (AV *)mg->mg_obj;
317 478
318 if (AvFILLp (av) >= AvMAX (av)) 479 if (expect_false (AvFILLp (av) >= AvMAX (av)))
319 av_extend (av, AvMAX (av) + 1); 480 av_extend (av, AvMAX (av) + 1);
320 481
321 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 482 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
322} 483}
323 484
324/** load & save, init *******************************************************/ 485/** load & save, init *******************************************************/
325 486
326#define SB do {
327#define SE } while (0)
328
329#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
330
331static void 487static void
332load_perl (Coro__State c) 488load_perl (pTHX_ Coro__State c)
333{ 489{
490 perl_slots *slot = c->slot;
491 c->slot = 0;
492
493 PL_mainstack = c->mainstack;
494
495 GvSV (PL_defgv) = slot->defsv;
496 GvAV (PL_defgv) = slot->defav;
497 GvSV (PL_errgv) = slot->errsv;
498 GvSV (irsgv) = slot->irsgv;
499
334#define VAR(name,type) PL_ ## name = c->name; 500 #define VAR(name,type) PL_ ## name = slot->name;
335# include "state.h" 501 # include "state.h"
336#undef VAR 502 #undef VAR
337
338 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
339 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
340 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
341 if (c->irssv)
342 {
343 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
344 SvREFCNT_dec (c->irssv);
345 else
346 {
347 REPLACE_SV (PL_rs, c->irssv);
348 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
349 sv_setsv (c->irssv_sv, PL_rs);
350 }
351 }
352 503
353 { 504 {
354 dSP; 505 dSP;
506
355 CV *cv; 507 CV *cv;
356 508
357 /* now do the ugly restore mess */ 509 /* now do the ugly restore mess */
358 while ((cv = (CV *)POPs)) 510 while (expect_true (cv = (CV *)POPs))
359 { 511 {
360 put_padlist (cv); /* mark this padlist as available */ 512 put_padlist (aTHX_ cv); /* mark this padlist as available */
361 CvDEPTH (cv) = PTR2IV (POPs); 513 CvDEPTH (cv) = PTR2IV (POPs);
362 CvPADLIST (cv) = (AV *)POPs; 514 CvPADLIST (cv) = (AV *)POPs;
363 } 515 }
364 516
365 PUTBACK; 517 PUTBACK;
366 } 518 }
367}
368 519
520 slf_frame = c->slf_frame;
521}
522
369static void 523static void
370save_perl (Coro__State c) 524save_perl (pTHX_ Coro__State c)
371{ 525{
526 c->slf_frame = slf_frame;
527
372 { 528 {
373 dSP; 529 dSP;
374 I32 cxix = cxstack_ix; 530 I32 cxix = cxstack_ix;
375 PERL_CONTEXT *ccstk = cxstack; 531 PERL_CONTEXT *ccstk = cxstack;
376 PERL_SI *top_si = PL_curstackinfo; 532 PERL_SI *top_si = PL_curstackinfo;
… …
378 /* 534 /*
379 * the worst thing you can imagine happens first - we have to save 535 * the worst thing you can imagine happens first - we have to save
380 * (and reinitialize) all cv's in the whole callchain :( 536 * (and reinitialize) all cv's in the whole callchain :(
381 */ 537 */
382 538
383 EXTEND (SP, 3 + 1);
384 PUSHs (Nullsv); 539 XPUSHs (Nullsv);
385 /* this loop was inspired by pp_caller */ 540 /* this loop was inspired by pp_caller */
386 for (;;) 541 for (;;)
387 { 542 {
388 while (cxix >= 0) 543 while (expect_true (cxix >= 0))
389 { 544 {
390 PERL_CONTEXT *cx = &ccstk[cxix--]; 545 PERL_CONTEXT *cx = &ccstk[cxix--];
391 546
392 if (CxTYPE (cx) == CXt_SUB) 547 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
393 { 548 {
394 CV *cv = cx->blk_sub.cv; 549 CV *cv = cx->blk_sub.cv;
395 550
396 if (CvDEPTH (cv)) 551 if (expect_true (CvDEPTH (cv)))
397 { 552 {
398 EXTEND (SP, 3); 553 EXTEND (SP, 3);
399 PUSHs ((SV *)CvPADLIST (cv)); 554 PUSHs ((SV *)CvPADLIST (cv));
400 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 555 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
401 PUSHs ((SV *)cv); 556 PUSHs ((SV *)cv);
402 557
403 CvDEPTH (cv) = 0; 558 CvDEPTH (cv) = 0;
404 get_padlist (cv); 559 get_padlist (aTHX_ cv);
405 } 560 }
406 } 561 }
407 } 562 }
408 563
409 if (top_si->si_type == PERLSI_MAIN) 564 if (expect_true (top_si->si_type == PERLSI_MAIN))
410 break; 565 break;
411 566
412 top_si = top_si->si_prev; 567 top_si = top_si->si_prev;
413 ccstk = top_si->si_cxstack; 568 ccstk = top_si->si_cxstack;
414 cxix = top_si->si_cxix; 569 cxix = top_si->si_cxix;
415 } 570 }
416 571
417 PUTBACK; 572 PUTBACK;
418 } 573 }
419 574
420 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 575 /* allocate some space on the context stack for our purposes */
421 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 576 /* we manually unroll here, as usually 2 slots is enough */
422 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 577 if (SLOT_COUNT >= 1) CXINC;
423 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 578 if (SLOT_COUNT >= 2) CXINC;
579 if (SLOT_COUNT >= 3) CXINC;
580 {
581 int i;
582 for (i = 3; i < SLOT_COUNT; ++i)
583 CXINC;
584 }
585 cxstack_ix -= SLOT_COUNT; /* undo allocation */
424 586
587 c->mainstack = PL_mainstack;
588
589 {
590 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
591
592 slot->defav = GvAV (PL_defgv);
593 slot->defsv = DEFSV;
594 slot->errsv = ERRSV;
595 slot->irsgv = GvSV (irsgv);
596
425#define VAR(name,type)c->name = PL_ ## name; 597 #define VAR(name,type) slot->name = PL_ ## name;
426# include "state.h" 598 # include "state.h"
427#undef VAR 599 #undef VAR
600 }
428} 601}
429 602
430/* 603/*
431 * allocate various perl stacks. This is an exact copy 604 * allocate various perl stacks. This is almost an exact copy
432 * of perl.c:init_stacks, except that it uses less memory 605 * of perl.c:init_stacks, except that it uses less memory
433 * on the (sometimes correct) assumption that coroutines do 606 * on the (sometimes correct) assumption that coroutines do
434 * not usually need a lot of stackspace. 607 * not usually need a lot of stackspace.
435 */ 608 */
436#if PREFER_PERL_FUNCTIONS 609#if CORO_PREFER_PERL_FUNCTIONS
437# define coro_init_stacks init_stacks 610# define coro_init_stacks init_stacks
438#else 611#else
439static void 612static void
440coro_init_stacks () 613coro_init_stacks (pTHX)
441{ 614{
442 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT)); 615 PL_curstackinfo = new_stackinfo(32, 8);
443 PL_curstackinfo->si_type = PERLSI_MAIN; 616 PL_curstackinfo->si_type = PERLSI_MAIN;
444 PL_curstack = PL_curstackinfo->si_stack; 617 PL_curstack = PL_curstackinfo->si_stack;
445 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 618 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
446 619
447 PL_stack_base = AvARRAY(PL_curstack); 620 PL_stack_base = AvARRAY(PL_curstack);
448 PL_stack_sp = PL_stack_base; 621 PL_stack_sp = PL_stack_base;
449 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 622 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
450 623
451 New(50,PL_tmps_stack,128,SV*); 624 New(50,PL_tmps_stack,32,SV*);
452 PL_tmps_floor = -1; 625 PL_tmps_floor = -1;
453 PL_tmps_ix = -1; 626 PL_tmps_ix = -1;
454 PL_tmps_max = 128; 627 PL_tmps_max = 32;
455 628
456 New(54,PL_markstack,32,I32); 629 New(54,PL_markstack,16,I32);
457 PL_markstack_ptr = PL_markstack; 630 PL_markstack_ptr = PL_markstack;
458 PL_markstack_max = PL_markstack + 32; 631 PL_markstack_max = PL_markstack + 16;
459 632
460#ifdef SET_MARK_OFFSET 633#ifdef SET_MARK_OFFSET
461 SET_MARK_OFFSET; 634 SET_MARK_OFFSET;
462#endif 635#endif
463 636
464 New(54,PL_scopestack,32,I32); 637 New(54,PL_scopestack,8,I32);
465 PL_scopestack_ix = 0; 638 PL_scopestack_ix = 0;
466 PL_scopestack_max = 32; 639 PL_scopestack_max = 8;
467 640
468 New(54,PL_savestack,64,ANY); 641 New(54,PL_savestack,24,ANY);
469 PL_savestack_ix = 0; 642 PL_savestack_ix = 0;
470 PL_savestack_max = 64; 643 PL_savestack_max = 24;
471 644
472#if !PERL_VERSION_ATLEAST (5,9,0) 645#if !PERL_VERSION_ATLEAST (5,10,0)
473 New(54,PL_retstack,16,OP*); 646 New(54,PL_retstack,4,OP*);
474 PL_retstack_ix = 0; 647 PL_retstack_ix = 0;
475 PL_retstack_max = 16; 648 PL_retstack_max = 4;
476#endif 649#endif
477} 650}
478#endif 651#endif
479 652
480/* 653/*
481 * destroy the stacks, the callchain etc... 654 * destroy the stacks, the callchain etc...
482 */ 655 */
483static void 656static void
484coro_destroy_stacks () 657coro_destruct_stacks (pTHX)
485{ 658{
486 if (!IN_DESTRUCT)
487 {
488 /* restore all saved variables and stuff */
489 LEAVE_SCOPE (0);
490 assert (PL_tmps_floor == -1);
491
492 /* free all temporaries */
493 FREETMPS;
494 assert (PL_tmps_ix == -1);
495
496 /* unwind all extra stacks */
497 POPSTACK_TO (PL_mainstack);
498
499 /* unwind main stack */
500 dounwind (-1);
501 }
502
503 while (PL_curstackinfo->si_next) 659 while (PL_curstackinfo->si_next)
504 PL_curstackinfo = PL_curstackinfo->si_next; 660 PL_curstackinfo = PL_curstackinfo->si_next;
505 661
506 while (PL_curstackinfo) 662 while (PL_curstackinfo)
507 { 663 {
… …
517 673
518 Safefree (PL_tmps_stack); 674 Safefree (PL_tmps_stack);
519 Safefree (PL_markstack); 675 Safefree (PL_markstack);
520 Safefree (PL_scopestack); 676 Safefree (PL_scopestack);
521 Safefree (PL_savestack); 677 Safefree (PL_savestack);
522#if !PERL_VERSION_ATLEAST (5,9,0) 678#if !PERL_VERSION_ATLEAST (5,10,0)
523 Safefree (PL_retstack); 679 Safefree (PL_retstack);
524#endif 680#endif
525} 681}
526 682
683static size_t
684coro_rss (pTHX_ struct coro *coro)
685{
686 size_t rss = sizeof (*coro);
687
688 if (coro->mainstack)
689 {
690 perl_slots tmp_slot;
691 perl_slots *slot;
692
693 if (coro->flags & CF_RUNNING)
694 {
695 slot = &tmp_slot;
696
697 #define VAR(name,type) slot->name = PL_ ## name;
698 # include "state.h"
699 #undef VAR
700 }
701 else
702 slot = coro->slot;
703
704 if (slot)
705 {
706 rss += sizeof (slot->curstackinfo);
707 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
708 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
709 rss += slot->tmps_max * sizeof (SV *);
710 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
711 rss += slot->scopestack_max * sizeof (I32);
712 rss += slot->savestack_max * sizeof (ANY);
713
714#if !PERL_VERSION_ATLEAST (5,10,0)
715 rss += slot->retstack_max * sizeof (OP *);
716#endif
717 }
718 }
719
720 return rss;
721}
722
527/** coroutine stack handling ************************************************/ 723/** coroutine stack handling ************************************************/
528 724
725static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
726static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
727static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
728
729/* apparently < 5.8.8 */
730#ifndef MgPV_nolen_const
731#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
732 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
733 (const char*)(mg)->mg_ptr)
734#endif
735
736/*
737 * This overrides the default magic get method of %SIG elements.
738 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
739 * and instead of tryign to save and restore the hash elements, we just provide
740 * readback here.
741 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
742 * not expecting this to actually change the hook. This is a potential problem
743 * when a schedule happens then, but we ignore this.
744 */
529static void 745static int
530setup_coro (struct coro *coro) 746coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
747{
748 const char *s = MgPV_nolen_const (mg);
749
750 if (*s == '_')
751 {
752 SV **svp = 0;
753
754 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
755 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
756
757 if (svp)
758 {
759 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
760 return 0;
761 }
762 }
763
764 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
765}
766
767static int
768coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
769{
770 const char *s = MgPV_nolen_const (mg);
771
772 if (*s == '_')
773 {
774 SV **svp = 0;
775
776 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
777 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
778
779 if (svp)
780 {
781 SV *old = *svp;
782 *svp = 0;
783 SvREFCNT_dec (old);
784 return 0;
785 }
786 }
787
788 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
789}
790
791static int
792coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
793{
794 const char *s = MgPV_nolen_const (mg);
795
796 if (*s == '_')
797 {
798 SV **svp = 0;
799
800 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
801 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
802
803 if (svp)
804 {
805 SV *old = *svp;
806 *svp = newSVsv (sv);
807 SvREFCNT_dec (old);
808 return 0;
809 }
810 }
811
812 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
813}
814
815static void
816prepare_nop (aTHX_ struct coro_transfer_args *ta)
817{
818 /* kind of mega-hacky, but works */
819 ta->next = ta->prev = (struct coro *)ta;
820}
821
822static int
823slf_check_nop (aTHX)
824{
825 return 0;
826}
827
828static void
829coro_setup (pTHX_ struct coro *coro)
531{ 830{
532 /* 831 /*
533 * emulate part of the perl startup here. 832 * emulate part of the perl startup here.
534 */ 833 */
535
536 coro_init_stacks (); 834 coro_init_stacks (aTHX);
537 835
836 PL_runops = RUNOPS_DEFAULT;
538 PL_curcop = &PL_compiling; 837 PL_curcop = &PL_compiling;
539 PL_in_eval = EVAL_NULL; 838 PL_in_eval = EVAL_NULL;
839 PL_comppad = 0;
540 PL_curpm = 0; 840 PL_curpm = 0;
841 PL_curpad = 0;
541 PL_localizing = 0; 842 PL_localizing = 0;
542 PL_dirty = 0; 843 PL_dirty = 0;
543 PL_restartop = 0; 844 PL_restartop = 0;
845#if PERL_VERSION_ATLEAST (5,10,0)
846 PL_parser = 0;
847#endif
848
849 /* recreate the die/warn hooks */
850 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);
852
853 GvSV (PL_defgv) = newSV (0);
854 GvAV (PL_defgv) = coro->args; coro->args = 0;
855 GvSV (PL_errgv) = newSV (0);
856 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
857 PL_rs = newSVsv (GvSV (irsgv));
858 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
544 859
545 { 860 {
546 dSP; 861 dSP;
547 LOGOP myop; 862 UNOP myop;
548 863
549 SvREFCNT_dec (GvAV (PL_defgv));
550 GvAV (PL_defgv) = coro->args; coro->args = 0;
551
552 Zero (&myop, 1, LOGOP); 864 Zero (&myop, 1, UNOP);
553 myop.op_next = Nullop; 865 myop.op_next = Nullop;
554 myop.op_flags = OPf_WANT_VOID; 866 myop.op_flags = OPf_WANT_VOID;
555 867
556 PUSHMARK (SP); 868 PUSHMARK (SP);
557 XPUSHs ((SV *)get_cv ("Coro::State::_coro_init", FALSE)); 869 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
558 PUTBACK; 870 PUTBACK;
559 PL_op = (OP *)&myop; 871 PL_op = (OP *)&myop;
560 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 872 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
561 SPAGAIN; 873 SPAGAIN;
562 } 874 }
563 875
564 ENTER; /* necessary e.g. for dounwind */ 876 /* 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.
878 */
879 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 */
565} 881}
566 882
567static void 883static void
884coro_destruct (pTHX_ struct coro *coro)
885{
886 if (!IN_DESTRUCT)
887 {
888 /* restore all saved variables and stuff */
889 LEAVE_SCOPE (0);
890 assert (PL_tmps_floor == -1);
891
892 /* free all temporaries */
893 FREETMPS;
894 assert (PL_tmps_ix == -1);
895
896 /* unwind all extra stacks */
897 POPSTACK_TO (PL_mainstack);
898
899 /* unwind main stack */
900 dounwind (-1);
901 }
902
903 SvREFCNT_dec (GvSV (PL_defgv));
904 SvREFCNT_dec (GvAV (PL_defgv));
905 SvREFCNT_dec (GvSV (PL_errgv));
906 SvREFCNT_dec (PL_defoutgv);
907 SvREFCNT_dec (PL_rs);
908 SvREFCNT_dec (GvSV (irsgv));
909
910 SvREFCNT_dec (PL_diehook);
911 SvREFCNT_dec (PL_warnhook);
912
913 SvREFCNT_dec (coro->saved_deffh);
914 SvREFCNT_dec (coro->throw);
915
916 coro_destruct_stacks (aTHX);
917}
918
919INLINE void
568free_coro_mortal () 920free_coro_mortal (pTHX)
569{ 921{
570 if (coro_mortal) 922 if (expect_true (coro_mortal))
571 { 923 {
572 SvREFCNT_dec (coro_mortal); 924 SvREFCNT_dec (coro_mortal);
573 coro_mortal = 0; 925 coro_mortal = 0;
574 } 926 }
575} 927}
576 928
929static int
930runops_trace (pTHX)
931{
932 COP *oldcop = 0;
933 int oldcxix = -2;
934 struct coro *coro = SvSTATE (coro_current); /* trace cctx is tied to specific coro */
935 coro_cctx *cctx = coro->cctx;
936
937 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
938 {
939 PERL_ASYNC_CHECK ();
940
941 if (cctx->flags & CC_TRACE_ALL)
942 {
943 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB)
944 {
945 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
946 SV **bot, **top;
947 AV *av = newAV (); /* return values */
948 SV **cb;
949 dSP;
950
951 GV *gv = CvGV (cx->blk_sub.cv);
952 SV *fullname = sv_2mortal (newSV (0));
953 if (isGV (gv))
954 gv_efullname3 (fullname, gv, 0);
955
956 bot = PL_stack_base + cx->blk_oldsp + 1;
957 top = cx->blk_gimme == G_ARRAY ? SP + 1
958 : cx->blk_gimme == G_SCALAR ? bot + 1
959 : bot;
960
961 av_extend (av, top - bot);
962 while (bot < top)
963 av_push (av, SvREFCNT_inc_NN (*bot++));
964
965 PL_runops = RUNOPS_DEFAULT;
966 ENTER;
967 SAVETMPS;
968 EXTEND (SP, 3);
969 PUSHMARK (SP);
970 PUSHs (&PL_sv_no);
971 PUSHs (fullname);
972 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
973 PUTBACK;
974 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
975 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
976 SPAGAIN;
977 FREETMPS;
978 LEAVE;
979 PL_runops = runops_trace;
980 }
981
982 if (oldcop != PL_curcop)
983 {
984 oldcop = PL_curcop;
985
986 if (PL_curcop != &PL_compiling)
987 {
988 SV **cb;
989
990 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
991 {
992 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
993
994 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
995 {
996 runops_proc_t old_runops = PL_runops;
997 dSP;
998 GV *gv = CvGV (cx->blk_sub.cv);
999 SV *fullname = sv_2mortal (newSV (0));
1000
1001 if (isGV (gv))
1002 gv_efullname3 (fullname, gv, 0);
1003
1004 PL_runops = RUNOPS_DEFAULT;
1005 ENTER;
1006 SAVETMPS;
1007 EXTEND (SP, 3);
1008 PUSHMARK (SP);
1009 PUSHs (&PL_sv_yes);
1010 PUSHs (fullname);
1011 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
1012 PUTBACK;
1013 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1014 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1015 SPAGAIN;
1016 FREETMPS;
1017 LEAVE;
1018 PL_runops = runops_trace;
1019 }
1020
1021 oldcxix = cxstack_ix;
1022 }
1023
1024 if (cctx->flags & CC_TRACE_LINE)
1025 {
1026 dSP;
1027
1028 PL_runops = RUNOPS_DEFAULT;
1029 ENTER;
1030 SAVETMPS;
1031 EXTEND (SP, 3);
1032 PL_runops = RUNOPS_DEFAULT;
1033 PUSHMARK (SP);
1034 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1035 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1036 PUTBACK;
1037 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
1038 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1039 SPAGAIN;
1040 FREETMPS;
1041 LEAVE;
1042 PL_runops = runops_trace;
1043 }
1044 }
1045 }
1046 }
1047 }
1048
1049 TAINT_NOT;
1050 return 0;
1051}
1052
1053static void
1054prepare_set_stacklevel (struct coro_transfer_args *ta, struct coro_cctx *cctx)
1055{
1056 ta->prev = (struct coro *)cctx;
1057 ta->next = 0;
1058}
1059
577/* inject a fake call to Coro::State::_cctx_init into the execution */ 1060/* inject a fake call to Coro::State::_cctx_init into the execution */
1061/* _cctx_init should be careful, as it could be called at almost any time */
1062/* during execution of a perl program */
1063/* also initialises PL_top_env */
578static void NOINLINE 1064static void NOINLINE
579prepare_cctx (coro_cctx *cctx) 1065cctx_prepare (pTHX_ coro_cctx *cctx)
580{ 1066{
581 dSP; 1067 dSP;
582 LOGOP myop; 1068 UNOP myop;
583 1069
1070 PL_top_env = &PL_start_env;
1071
1072 if (cctx->flags & CC_TRACE)
1073 PL_runops = runops_trace;
1074
584 Zero (&myop, 1, LOGOP); 1075 Zero (&myop, 1, UNOP);
585 myop.op_next = PL_op; 1076 myop.op_next = PL_op;
586 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1077 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
587 1078
588 PUSHMARK (SP); 1079 PUSHMARK (SP);
589 EXTEND (SP, 2); 1080 EXTEND (SP, 2);
590 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1081 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
591 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1082 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
592 PUTBACK; 1083 PUTBACK;
593 PL_op = (OP *)&myop; 1084 PL_op = (OP *)&myop;
594 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1085 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
595 SPAGAIN; 1086 SPAGAIN;
596} 1087}
597 1088
598static void 1089/* the tail of transfer: execute stuff we can only do after a transfer */
599coro_run (void *arg) 1090INLINE void
1091transfer_tail (pTHX)
600{ 1092{
601 /* coro_run is the alternative tail of transfer(), so unlock here. */ 1093 struct coro *next = (struct coro *)transfer_next;
1094 assert (!(transfer_next = 0)); /* just used for the side effect when asserts are enabled */
1095 assert (("FATAL: next coroutine was zero in transfer_tail (please report)", next));
1096
1097 free_coro_mortal (aTHX);
602 UNLOCK; 1098 UNLOCK;
603 1099
604 /* 1100 if (expect_false (next->throw))
1101 {
1102 SV *exception = sv_2mortal (next->throw);
1103
1104 next->throw = 0;
1105 sv_setsv (ERRSV, exception);
1106 croak (0);
1107 }
1108}
1109
1110/*
605 * this is a _very_ stripped down perl interpreter ;) 1111 * this is a _very_ stripped down perl interpreter ;)
606 */ 1112 */
607 PL_top_env = &PL_start_env; 1113static void
1114cctx_run (void *arg)
1115{
1116#ifdef USE_ITHREADS
1117# if CORO_PTHREAD
1118 PERL_SET_CONTEXT (coro_thx);
1119# endif
1120#endif
1121 {
1122 dTHX;
608 1123
1124 /* normally we would need to skip the entersub here */
1125 /* not doing so will re-execute it, which is exactly what we want */
1126 /* PL_nop = PL_nop->op_next */
1127
609 /* inject call to cctx_init */ 1128 /* inject a fake subroutine call to cctx_init */
610 prepare_cctx ((coro_cctx *)arg); 1129 cctx_prepare (aTHX_ (coro_cctx *)arg);
611 1130
1131 /* cctx_run is the alternative tail of transfer() */
1132 /* TODO: throwing an exception here might be deadly, VERIFY */
1133 transfer_tail (aTHX);
1134
612 /* somebody will hit me for both perl_run and PL_restartop */ 1135 /* somebody or something will hit me for both perl_run and PL_restartop */
613 PL_restartop = PL_op; 1136 PL_restartop = PL_op;
614 perl_run (PL_curinterp); 1137 perl_run (PL_curinterp);
615 1138
616 fputs ("FATAL: C coroutine fell over the edge of the world, aborting. Did you call exit in a coroutine?\n", stderr); 1139 /*
617 abort (); 1140 * If perl-run returns we assume exit() was being called or the coro
1141 * fell off the end, which seems to be the only valid (non-bug)
1142 * reason for perl_run to return. We try to exit by jumping to the
1143 * bootstrap-time "top" top_env, as we cannot restore the "main"
1144 * coroutine as Coro has no such concept
1145 */
1146 PL_top_env = main_top_env;
1147 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1148 }
618} 1149}
619 1150
620static coro_cctx * 1151static coro_cctx *
621cctx_new () 1152cctx_new ()
622{ 1153{
623 coro_cctx *cctx; 1154 coro_cctx *cctx;
624 1155
625 ++cctx_count; 1156 ++cctx_count;
626
627 Newz (0, cctx, 1, coro_cctx); 1157 New (0, cctx, 1, coro_cctx);
1158
1159 cctx->gen = cctx_gen;
1160 cctx->flags = 0;
1161 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel, on throw */
1162
1163 return cctx;
1164}
1165
1166/* create a new cctx only suitable as source */
1167static coro_cctx *
1168cctx_new_empty ()
1169{
1170 coro_cctx *cctx = cctx_new ();
1171
1172 cctx->sptr = 0;
1173 coro_create (&cctx->cctx, 0, 0, 0, 0);
1174
1175 return cctx;
1176}
1177
1178/* create a new cctx suitable as destination/running a perl interpreter */
1179static coro_cctx *
1180cctx_new_run ()
1181{
1182 coro_cctx *cctx = cctx_new ();
1183 void *stack_start;
1184 size_t stack_size;
628 1185
629#if HAVE_MMAP 1186#if HAVE_MMAP
630
631 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 1187 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
632 /* mmap supposedly does allocate-on-write for us */ 1188 /* mmap supposedly does allocate-on-write for us */
633 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1189 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
634 1190
635 if (cctx->sptr == (void *)-1) 1191 if (cctx->sptr != (void *)-1)
1192 {
1193 #if CORO_STACKGUARD
1194 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
1195 #endif
1196 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
1197 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
1198 cctx->flags |= CC_MAPPED;
636 { 1199 }
1200 else
1201#endif
1202 {
1203 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1204 New (0, cctx->sptr, cctx_stacksize, long);
1205
1206 if (!cctx->sptr)
1207 {
637 perror ("FATAL: unable to mmap stack for coroutine"); 1208 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
638 _exit (EXIT_FAILURE); 1209 _exit (EXIT_FAILURE);
639 } 1210 }
640 1211
641# if STACKGUARD 1212 stack_start = cctx->sptr;
642 mprotect (cctx->sptr, STACKGUARD * PAGESIZE, PROT_NONE); 1213 stack_size = cctx->ssize;
643# endif
644
645#else
646
647 cctx->ssize = STACKSIZE * (long)sizeof (long);
648 New (0, cctx->sptr, STACKSIZE, long);
649
650 if (!cctx->sptr)
651 { 1214 }
652 perror ("FATAL: unable to malloc stack for coroutine");
653 _exit (EXIT_FAILURE);
654 }
655 1215
1216 #if CORO_USE_VALGRIND
1217 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
656#endif 1218 #endif
657 1219
658#if USE_VALGRIND 1220 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
659 cctx->valgrind_id = VALGRIND_STACK_REGISTER (
660 STACKGUARD * PAGESIZE + (char *)cctx->sptr,
661 cctx->ssize + (char *)cctx->sptr
662 );
663#endif
664
665 coro_create (&cctx->cctx, coro_run, (void *)cctx, cctx->sptr, cctx->ssize);
666 1221
667 return cctx; 1222 return cctx;
668} 1223}
669 1224
670static void 1225static void
… …
672{ 1227{
673 if (!cctx) 1228 if (!cctx)
674 return; 1229 return;
675 1230
676 --cctx_count; 1231 --cctx_count;
1232 coro_destroy (&cctx->cctx);
677 1233
678#if USE_VALGRIND 1234 /* coro_transfer creates new, empty cctx's */
1235 if (cctx->sptr)
1236 {
1237 #if CORO_USE_VALGRIND
679 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1238 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
680#endif 1239 #endif
681 1240
682#if HAVE_MMAP 1241#if HAVE_MMAP
1242 if (cctx->flags & CC_MAPPED)
683 munmap (cctx->sptr, cctx->ssize); 1243 munmap (cctx->sptr, cctx->ssize);
684#else 1244 else
1245#endif
685 Safefree (cctx->sptr); 1246 Safefree (cctx->sptr);
686#endif 1247 }
687 1248
688 Safefree (cctx); 1249 Safefree (cctx);
689} 1250}
690 1251
1252/* wether this cctx should be destructed */
1253#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1254
691static coro_cctx * 1255static coro_cctx *
692cctx_get () 1256cctx_get (pTHX)
693{ 1257{
694 coro_cctx *cctx; 1258 while (expect_true (cctx_first))
695
696 if (cctx_first)
697 { 1259 {
698 cctx = cctx_first; 1260 coro_cctx *cctx = cctx_first;
699 cctx_first = cctx->next; 1261 cctx_first = cctx->next;
700 --cctx_idle; 1262 --cctx_idle;
701 } 1263
702 else 1264 if (expect_true (!CCTX_EXPIRED (cctx)))
703 { 1265 return cctx;
704 cctx = cctx_new (); 1266
705 PL_op = PL_op->op_next; 1267 cctx_destroy (cctx);
706 } 1268 }
707 1269
708 return cctx; 1270 return cctx_new_run ();
709} 1271}
710 1272
711static void 1273static void
712cctx_put (coro_cctx *cctx) 1274cctx_put (coro_cctx *cctx)
713{ 1275{
1276 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1277
714 /* free another cctx if overlimit */ 1278 /* free another cctx if overlimit */
715 if (cctx_idle >= MAX_IDLE_CCTX) 1279 if (expect_false (cctx_idle >= cctx_max_idle))
716 { 1280 {
717 coro_cctx *first = cctx_first; 1281 coro_cctx *first = cctx_first;
718 cctx_first = first->next; 1282 cctx_first = first->next;
719 --cctx_idle; 1283 --cctx_idle;
720 1284
721 assert (!first->inuse);
722 cctx_destroy (first); 1285 cctx_destroy (first);
723 } 1286 }
724 1287
725 ++cctx_idle; 1288 ++cctx_idle;
726 cctx->next = cctx_first; 1289 cctx->next = cctx_first;
727 cctx_first = cctx; 1290 cctx_first = cctx;
728} 1291}
729 1292
730/** coroutine switching *****************************************************/ 1293/** coroutine switching *****************************************************/
731 1294
732/* never call directly, always through the coro_state_transfer global variable */ 1295static void
1296transfer_check (pTHX_ struct coro *prev, struct coro *next)
1297{
1298 if (expect_true (prev != next))
1299 {
1300 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1301 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,");
1302
1303 if (expect_false (next->flags & CF_RUNNING))
1304 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1305
1306 if (expect_false (next->flags & CF_DESTROYED))
1307 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,");
1308
1309#if !PERL_VERSION_ATLEAST (5,10,0)
1310 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1311 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1312#endif
1313 }
1314}
1315
1316/* always use the TRANSFER macro */
733static void NOINLINE 1317static void NOINLINE
734transfer (struct coro *prev, struct coro *next) 1318transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
735{ 1319{
736 dSTACKLEVEL; 1320 dSTACKLEVEL;
737 1321
738 /* sometimes transfer is only called to set idle_sp */ 1322 /* sometimes transfer is only called to set idle_sp */
739 if (!next) 1323 if (expect_false (!next))
740 { 1324 {
741 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1325 ((coro_cctx *)prev)->idle_sp = stacklevel;
742 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1326 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
743 } 1327 }
744 else if (prev != next) 1328 else if (expect_true (prev != next))
745 { 1329 {
746 coro_cctx *prev__cctx; 1330 coro_cctx *prev__cctx;
747 1331
748 if (prev->flags & CF_NEW) 1332 if (expect_false (prev->flags & CF_NEW))
749 { 1333 {
750 /* create a new empty context */ 1334 /* create a new empty/source context */
751 Newz (0, prev->cctx, 1, coro_cctx); 1335 prev->cctx = cctx_new_empty ();
752 prev->cctx->inuse = 1;
753 prev->flags &= ~CF_NEW; 1336 prev->flags &= ~CF_NEW;
754 prev->flags |= CF_RUNNING; 1337 prev->flags |= CF_RUNNING;
755 } 1338 }
756 1339
757 /*TODO: must not croak here */
758 if (!prev->flags & CF_RUNNING)
759 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
760
761 if (next->flags & CF_RUNNING)
762 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
763
764 if (next->flags & CF_DESTROYED)
765 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
766
767 prev->flags &= ~CF_RUNNING; 1340 prev->flags &= ~CF_RUNNING;
768 next->flags |= CF_RUNNING; 1341 next->flags |= CF_RUNNING;
769 1342
770 LOCK; 1343 LOCK;
771 1344
1345 /* first get rid of the old state */
1346 save_perl (aTHX_ prev);
1347
772 if (next->flags & CF_NEW) 1348 if (expect_false (next->flags & CF_NEW))
773 { 1349 {
774 /* need to start coroutine */ 1350 /* need to start coroutine */
775 next->flags &= ~CF_NEW; 1351 next->flags &= ~CF_NEW;
776 /* first get rid of the old state */
777 save_perl (prev);
778 /* setup coroutine call */ 1352 /* setup coroutine call */
779 setup_coro (next); 1353 coro_setup (aTHX_ next);
780 /* need a new stack */
781 assert (!next->cctx);
782 } 1354 }
783 else 1355 else
1356 load_perl (aTHX_ next);
1357
1358 prev__cctx = prev->cctx;
1359
1360 /* possibly untie and reuse the cctx */
1361 if (expect_true (
1362 prev__cctx->idle_sp == stacklevel
1363 && !(prev__cctx->flags & CC_TRACE)
1364 && !force_cctx
1365 ))
784 { 1366 {
785 /* coroutine already started */ 1367 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
786 save_perl (prev); 1368 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te));
787 load_perl (next); 1369
1370 prev->cctx = 0;
1371
1372 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1373 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1374 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1375 if (!next->cctx)
1376 next->cctx = cctx_get (aTHX);
1377
1378 cctx_put (prev__cctx);
788 } 1379 }
789 1380
790 prev__cctx = prev->cctx; 1381 ++next->usecount;
791 1382
792 /* possibly "free" the cctx */
793 if (prev__cctx->idle_sp == STACKLEVEL)
794 {
795 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
796 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
797
798 prev->cctx = 0;
799
800 cctx_put (prev__cctx);
801 prev__cctx->inuse = 0;
802 }
803
804 if (!next->cctx) 1383 if (expect_true (!next->cctx))
805 {
806 next->cctx = cctx_get (); 1384 next->cctx = cctx_get (aTHX);
807 assert (!next->cctx->inuse);
808 next->cctx->inuse = 1;
809 }
810 1385
1386 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1387 transfer_next = next;
1388
811 if (prev__cctx != next->cctx) 1389 if (expect_false (prev__cctx != next->cctx))
812 { 1390 {
813 prev__cctx->top_env = PL_top_env; 1391 prev__cctx->top_env = PL_top_env;
814 PL_top_env = next->cctx->top_env; 1392 PL_top_env = next->cctx->top_env;
815 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1393 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
816 } 1394 }
817 1395
818 free_coro_mortal (); 1396 transfer_tail (aTHX);
819 UNLOCK;
820 } 1397 }
821} 1398}
822 1399
823struct transfer_args 1400#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
824{
825 struct coro *prev, *next;
826};
827
828#define TRANSFER(ta) transfer ((ta).prev, (ta).next) 1401#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
829 1402
830/** high level stuff ********************************************************/ 1403/** high level stuff ********************************************************/
831 1404
832static int 1405static int
833coro_state_destroy (struct coro *coro) 1406coro_state_destroy (pTHX_ struct coro *coro)
834{ 1407{
835 if (coro->flags & CF_DESTROYED) 1408 if (coro->flags & CF_DESTROYED)
836 return 0; 1409 return 0;
837 1410
838 coro->flags |= CF_DESTROYED; 1411 coro->flags |= CF_DESTROYED;
… …
848 else 1421 else
849 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1422 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
850 1423
851 if (coro->mainstack && coro->mainstack != main_mainstack) 1424 if (coro->mainstack && coro->mainstack != main_mainstack)
852 { 1425 {
853 assert (!(coro->flags & CF_RUNNING));
854
855 struct coro temp; 1426 struct coro temp;
856 Zero (&temp, 1, struct coro);
857 temp.save = CORO_SAVE_ALL;
858 1427
859 if (coro->flags & CF_RUNNING) 1428 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
860 croak ("FATAL: tried to destroy currently running coroutine");
861 1429
862 save_perl (&temp); 1430 save_perl (aTHX_ &temp);
863 load_perl (coro); 1431 load_perl (aTHX_ coro);
864 1432
865 coro_destroy_stacks (); 1433 coro_destruct (aTHX_ coro);
866 1434
867 load_perl (&temp); /* this will get rid of defsv etc.. */ 1435 load_perl (aTHX_ &temp);
868 1436
869 coro->mainstack = 0; 1437 coro->slot = 0;
870 } 1438 }
871 1439
872 cctx_destroy (coro->cctx); 1440 cctx_destroy (coro->cctx);
873 SvREFCNT_dec (coro->args); 1441 SvREFCNT_dec (coro->args);
874 1442
1443 if (coro->next) coro->next->prev = coro->prev;
1444 if (coro->prev) coro->prev->next = coro->next;
1445 if (coro == coro_first) coro_first = coro->next;
1446
875 return 1; 1447 return 1;
876} 1448}
877 1449
878static int 1450static int
879coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1451coro_state_free (pTHX_ SV *sv, MAGIC *mg)
880{ 1452{
881 struct coro *coro = (struct coro *)mg->mg_ptr; 1453 struct coro *coro = (struct coro *)mg->mg_ptr;
882 mg->mg_ptr = 0; 1454 mg->mg_ptr = 0;
883 1455
1456 coro->hv = 0;
1457
884 if (--coro->refcnt < 0) 1458 if (--coro->refcnt < 0)
885 { 1459 {
886 coro_state_destroy (coro); 1460 coro_state_destroy (aTHX_ coro);
887 Safefree (coro); 1461 Safefree (coro);
888 } 1462 }
889 1463
890 return 0; 1464 return 0;
891} 1465}
… …
909#else 1483#else
910# define MGf_DUP 0 1484# define MGf_DUP 0
911#endif 1485#endif
912}; 1486};
913 1487
914static struct coro *
915SvSTATE (SV *coro)
916{
917 HV *stash;
918 MAGIC *mg;
919
920 if (SvROK (coro))
921 coro = SvRV (coro);
922
923 stash = SvSTASH (coro);
924 if (stash != coro_stash && stash != coro_state_stash)
925 {
926 /* very slow, but rare, check */
927 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
928 croak ("Coro::State object required");
929 }
930
931 mg = SvMAGIC (coro);
932 assert (mg->mg_type == PERL_MAGIC_ext);
933 return (struct coro *)mg->mg_ptr;
934}
935
936static void 1488static void
937prepare_transfer (struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1489prepare_transfer (pTHX_ struct coro_transfer_args *ta, SV *prev_sv, SV *next_sv)
938{ 1490{
939 ta->prev = SvSTATE (prev_sv); 1491 ta->prev = SvSTATE (prev_sv);
940 ta->next = SvSTATE (next_sv); 1492 ta->next = SvSTATE (next_sv);
1493 TRANSFER_CHECK (*ta);
941} 1494}
942 1495
943static void 1496static void
944api_transfer (SV *prev_sv, SV *next_sv) 1497api_transfer (pTHX_ SV *prev_sv, SV *next_sv)
945{ 1498{
946 struct transfer_args ta; 1499 struct coro_transfer_args ta;
947 1500
948 prepare_transfer (&ta, prev_sv, next_sv); 1501 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
949 TRANSFER (ta); 1502 TRANSFER (ta, 1);
950}
951
952static int
953api_save (SV *coro_sv, int new_save)
954{
955 struct coro *coro = SvSTATE (coro_sv);
956 int old_save = coro->save;
957
958 if (new_save >= 0)
959 coro->save = new_save;
960
961 return old_save;
962} 1503}
963 1504
964/** Coro ********************************************************************/ 1505/** Coro ********************************************************************/
965 1506
966static void 1507static void
967coro_enq (SV *coro_sv) 1508coro_enq (pTHX_ SV *coro_sv)
968{ 1509{
969 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1510 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
970} 1511}
971 1512
972static SV * 1513static SV *
973coro_deq (int min_prio) 1514coro_deq (pTHX)
974{ 1515{
975 int prio = PRIO_MAX - PRIO_MIN; 1516 int prio;
976 1517
977 min_prio -= PRIO_MIN;
978 if (min_prio < 0)
979 min_prio = 0;
980
981 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1518 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
982 if (AvFILLp (coro_ready [prio]) >= 0) 1519 if (AvFILLp (coro_ready [prio]) >= 0)
983 return av_shift (coro_ready [prio]); 1520 return av_shift (coro_ready [prio]);
984 1521
985 return 0; 1522 return 0;
986} 1523}
987 1524
988static int 1525static int
989api_ready (SV *coro_sv) 1526api_ready (pTHX_ SV *coro_sv)
990{ 1527{
991 struct coro *coro; 1528 struct coro *coro;
1529 SV *sv_hook;
1530 void (*xs_hook)(void);
992 1531
993 if (SvROK (coro_sv)) 1532 if (SvROK (coro_sv))
994 coro_sv = SvRV (coro_sv); 1533 coro_sv = SvRV (coro_sv);
995 1534
996 coro = SvSTATE (coro_sv); 1535 coro = SvSTATE (coro_sv);
… …
999 return 0; 1538 return 0;
1000 1539
1001 coro->flags |= CF_READY; 1540 coro->flags |= CF_READY;
1002 1541
1003 LOCK; 1542 LOCK;
1543
1544 sv_hook = coro_nready ? 0 : coro_readyhook;
1545 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1546
1004 coro_enq (SvREFCNT_inc (coro_sv)); 1547 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1005 ++coro_nready; 1548 ++coro_nready;
1549
1006 UNLOCK; 1550 UNLOCK;
1551
1552 if (sv_hook)
1553 {
1554 dSP;
1555
1556 ENTER;
1557 SAVETMPS;
1558
1559 PUSHMARK (SP);
1560 PUTBACK;
1561 call_sv (sv_hook, G_DISCARD);
1562 SPAGAIN;
1563
1564 FREETMPS;
1565 LEAVE;
1566 }
1567
1568 if (xs_hook)
1569 xs_hook ();
1007 1570
1008 return 1; 1571 return 1;
1009} 1572}
1010 1573
1011static int 1574static int
1012api_is_ready (SV *coro_sv) 1575api_is_ready (pTHX_ SV *coro_sv)
1013{ 1576{
1014 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1577 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1015} 1578}
1016 1579
1017static void 1580INLINE void
1018prepare_schedule (struct transfer_args *ta) 1581prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1019{ 1582{
1020 SV *prev_sv, *next_sv; 1583 SV *prev_sv, *next_sv;
1021 1584
1022 for (;;) 1585 for (;;)
1023 { 1586 {
1024 LOCK; 1587 LOCK;
1025 next_sv = coro_deq (PRIO_MIN); 1588 next_sv = coro_deq (aTHX);
1026 1589
1027 /* nothing to schedule: call the idle handler */ 1590 /* nothing to schedule: call the idle handler */
1028 if (!next_sv) 1591 if (expect_false (!next_sv))
1029 { 1592 {
1593 dSP;
1030 UNLOCK; 1594 UNLOCK;
1031 dSP;
1032 1595
1033 ENTER; 1596 ENTER;
1034 SAVETMPS; 1597 SAVETMPS;
1035 1598
1036 PUSHMARK (SP); 1599 PUSHMARK (SP);
1037 PUTBACK; 1600 PUTBACK;
1038 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1601 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1602 SPAGAIN;
1039 1603
1040 FREETMPS; 1604 FREETMPS;
1041 LEAVE; 1605 LEAVE;
1042 continue; 1606 continue;
1043 } 1607 }
1044 1608
1045 ta->next = SvSTATE (next_sv); 1609 ta->next = SvSTATE (next_sv);
1046 1610
1047 /* cannot transfer to destroyed coros, skip and look for next */ 1611 /* cannot transfer to destroyed coros, skip and look for next */
1048 if (ta->next->flags & CF_DESTROYED) 1612 if (expect_false (ta->next->flags & CF_DESTROYED))
1049 { 1613 {
1050 UNLOCK; 1614 UNLOCK;
1051 SvREFCNT_dec (next_sv); 1615 SvREFCNT_dec (next_sv);
1052 /* coro_nready is already taken care of by destroy */ 1616 /* coro_nready has already been taken care of by destroy */
1053 continue; 1617 continue;
1054 } 1618 }
1055 1619
1056 --coro_nready; 1620 --coro_nready;
1057 UNLOCK; 1621 UNLOCK;
1058 break; 1622 break;
1059 } 1623 }
1060 1624
1061 /* free this only after the transfer */ 1625 /* free this only after the transfer */
1062 prev_sv = SvRV (coro_current); 1626 prev_sv = SvRV (coro_current);
1627 ta->prev = SvSTATE (prev_sv);
1628 TRANSFER_CHECK (*ta);
1629 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1630 ta->next->flags &= ~CF_READY;
1063 SvRV_set (coro_current, next_sv); 1631 SvRV_set (coro_current, next_sv);
1064 ta->prev = SvSTATE (prev_sv);
1065
1066 assert (ta->next->flags & CF_READY);
1067 ta->next->flags &= ~CF_READY;
1068 1632
1069 LOCK; 1633 LOCK;
1070 free_coro_mortal (); 1634 free_coro_mortal (aTHX);
1071 coro_mortal = prev_sv; 1635 coro_mortal = prev_sv;
1072 UNLOCK; 1636 UNLOCK;
1073} 1637}
1074 1638
1075static void 1639INLINE void
1076prepare_cede (struct transfer_args *ta) 1640prepare_cede (pTHX_ struct coro_transfer_args *ta)
1077{ 1641{
1078 api_ready (coro_current); 1642 api_ready (aTHX_ coro_current);
1079 prepare_schedule (ta); 1643 prepare_schedule (aTHX_ ta);
1644}
1645
1646INLINE void
1647prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1648{
1649 SV *prev = SvRV (coro_current);
1650
1651 if (coro_nready)
1652 {
1653 prepare_schedule (aTHX_ ta);
1654 api_ready (aTHX_ prev);
1655 }
1656 else
1657 prepare_nop (aTHX_ ta);
1658}
1659
1660static void
1661api_schedule (pTHX)
1662{
1663 struct coro_transfer_args ta;
1664
1665 prepare_schedule (aTHX_ &ta);
1666 TRANSFER (ta, 1);
1080} 1667}
1081 1668
1082static int 1669static int
1083prepare_cede_notself (struct transfer_args *ta) 1670api_cede (pTHX)
1084{ 1671{
1085 if (coro_nready) 1672 struct coro_transfer_args ta;
1673
1674 prepare_cede (aTHX_ &ta);
1675
1676 if (expect_true (ta.prev != ta.next))
1086 { 1677 {
1087 SV *prev = SvRV (coro_current); 1678 TRANSFER (ta, 1);
1088 prepare_schedule (ta);
1089 api_ready (prev);
1090 return 1; 1679 return 1;
1091 } 1680 }
1092 else 1681 else
1093 return 0; 1682 return 0;
1094} 1683}
1095 1684
1096static void
1097api_schedule (void)
1098{
1099 struct transfer_args ta;
1100
1101 prepare_schedule (&ta);
1102 TRANSFER (ta);
1103}
1104
1105static int 1685static int
1106api_cede (void) 1686api_cede_notself (pTHX)
1107{ 1687{
1688 if (coro_nready)
1689 {
1108 struct transfer_args ta; 1690 struct coro_transfer_args ta;
1109 1691
1110 prepare_cede (&ta); 1692 prepare_cede_notself (aTHX_ &ta);
1111
1112 if (ta.prev != ta.next)
1113 {
1114 TRANSFER (ta); 1693 TRANSFER (ta, 1);
1115 return 1; 1694 return 1;
1116 } 1695 }
1117 else 1696 else
1118 return 0; 1697 return 0;
1119} 1698}
1120 1699
1700static void
1701api_trace (pTHX_ SV *coro_sv, int flags)
1702{
1703 struct coro *coro = SvSTATE (coro_sv);
1704
1705 if (flags & CC_TRACE)
1706 {
1707 if (!coro->cctx)
1708 coro->cctx = cctx_new_run ();
1709 else if (!(coro->cctx->flags & CC_TRACE))
1710 croak ("cannot enable tracing on coroutine with custom stack,");
1711
1712 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1713 }
1714 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1715 {
1716 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1717
1718 if (coro->flags & CF_RUNNING)
1719 PL_runops = RUNOPS_DEFAULT;
1720 else
1721 coro->slot->runops = RUNOPS_DEFAULT;
1722 }
1723}
1724
1725#if 0
1121static int 1726static int
1122api_cede_notself (void) 1727coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1123{ 1728{
1729 AV *padlist;
1730 AV *av = (AV *)mg->mg_obj;
1731
1732 abort ();
1733
1734 return 0;
1735}
1736
1737static MGVTBL coro_gensub_vtbl = {
1738 0, 0, 0, 0,
1739 coro_gensub_free
1740};
1741#endif
1742
1743/*****************************************************************************/
1744/* PerlIO::cede */
1745
1746typedef struct
1747{
1748 PerlIOBuf base;
1749 NV next, every;
1750} PerlIOCede;
1751
1752static IV
1753PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
1754{
1755 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1756
1757 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
1758 self->next = nvtime () + self->every;
1759
1760 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
1761}
1762
1763static SV *
1764PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
1765{
1766 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1767
1768 return newSVnv (self->every);
1769}
1770
1771static IV
1772PerlIOCede_flush (pTHX_ PerlIO *f)
1773{
1774 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1775 double now = nvtime ();
1776
1777 if (now >= self->next)
1778 {
1779 api_cede (aTHX);
1780 self->next = now + self->every;
1781 }
1782
1783 return PerlIOBuf_flush (aTHX_ f);
1784}
1785
1786static PerlIO_funcs PerlIO_cede =
1787{
1788 sizeof(PerlIO_funcs),
1789 "cede",
1790 sizeof(PerlIOCede),
1791 PERLIO_K_DESTRUCT | PERLIO_K_RAW,
1792 PerlIOCede_pushed,
1793 PerlIOBuf_popped,
1794 PerlIOBuf_open,
1795 PerlIOBase_binmode,
1796 PerlIOCede_getarg,
1797 PerlIOBase_fileno,
1798 PerlIOBuf_dup,
1799 PerlIOBuf_read,
1800 PerlIOBuf_unread,
1801 PerlIOBuf_write,
1802 PerlIOBuf_seek,
1803 PerlIOBuf_tell,
1804 PerlIOBuf_close,
1805 PerlIOCede_flush,
1806 PerlIOBuf_fill,
1807 PerlIOBase_eof,
1808 PerlIOBase_error,
1809 PerlIOBase_clearerr,
1810 PerlIOBase_setlinebuf,
1811 PerlIOBuf_get_base,
1812 PerlIOBuf_bufsiz,
1813 PerlIOBuf_get_ptr,
1814 PerlIOBuf_get_cnt,
1815 PerlIOBuf_set_ptrcnt,
1816};
1817
1818/*****************************************************************************/
1819
1820static const CV *slf_cv; /* for quick consistency check */
1821
1822static UNOP slf_restore; /* restore stack as entersub did, for first-re-run */
1823static SV *slf_arg0;
1824static SV *slf_arg1;
1825static SV *slf_arg2;
1826
1827/* this restores the stack in the case we patched the entersub, to */
1828/* recreate the stack frame as perl will on following calls */
1829/* since entersub cleared the stack */
1830static OP *
1831pp_restore (pTHX)
1832{
1833 dSP;
1834
1835 PUSHMARK (SP);
1836
1837 EXTEND (SP, 3);
1838 if (slf_arg0) PUSHs (sv_2mortal (slf_arg0));
1839 if (slf_arg1) PUSHs (sv_2mortal (slf_arg1));
1840 if (slf_arg2) PUSHs (sv_2mortal (slf_arg2));
1841 PUSHs ((SV *)CvGV (slf_cv));
1842
1843 RETURNOP (slf_restore.op_first);
1844}
1845
1846static void
1847slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1848{
1849 prepare_set_stacklevel (ta, (struct coro_cctx *)slf_frame.data);
1850}
1851
1852static void
1853slf_init_set_stacklevel (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1854{
1855 assert (("FATAL: set_stacklevel needs the coro cctx as sole argument", items == 1));
1856
1857 frame->prepare = slf_prepare_set_stacklevel;
1858 frame->check = slf_check_nop;
1859 frame->data = (void *)SvIV (arg [0]);
1860}
1861
1862static void
1863slf_prepare_transfer (pTHX_ struct coro_transfer_args *ta)
1864{
1865 SV **arg = (SV **)slf_frame.data;
1866
1867 prepare_transfer (ta, arg [0], arg [1]);
1868}
1869
1870static void
1871slf_init_transfer (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1872{
1873 if (items != 2)
1874 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d,", items);
1875
1876 frame->prepare = slf_prepare_transfer;
1877 frame->check = slf_check_nop;
1878 frame->data = (void *)arg; /* let's hope it will stay valid */
1879}
1880
1881static void
1882slf_init_schedule (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1883{
1884 frame->prepare = prepare_schedule;
1885 frame->check = slf_check_nop;
1886}
1887
1888static void
1889slf_init_cede (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1890{
1891 frame->prepare = prepare_cede;
1892 frame->check = slf_check_nop;
1893}
1894
1895static void
1896slf_init_cede_notself (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1897{
1898 frame->prepare = prepare_cede_notself;
1899 frame->check = slf_check_nop;
1900}
1901
1902/* we hijack an hopefully unused CV flag for our purposes */
1903#define CVf_SLF 0x4000
1904
1905/*
1906 * these not obviously related functions are all rolled into one
1907 * function to increase chances that they all will call transfer with the same
1908 * stack offset
1909 * SLF stands for "schedule-like-function".
1910 */
1911static OP *
1912pp_slf (pTHX)
1913{
1914 I32 checkmark; /* mark SP to see how many elements check has pushed */
1915
1916 /* set up the slf frame, unless it has already been set-up */
1917 /* the latter happens when a new coro has been started */
1918 /* or when a new cctx was attached to an existing coroutine */
1919 if (expect_true (!slf_frame.prepare))
1920 {
1921 /* first iteration */
1922 dSP;
1923 SV **arg = PL_stack_base + TOPMARK + 1;
1924 int items = SP - arg; /* args without function object */
1925 SV *gv = *sp;
1926
1927 /* do a quick consistency check on the "function" object, and if it isn't */
1928 /* for us, divert to the real entersub */
1929 if (SvTYPE (gv) != SVt_PVGV || !(CvFLAGS (GvCV (gv)) & CVf_SLF))
1930 return PL_ppaddr[OP_ENTERSUB](aTHX);
1931
1932 /* pop args */
1933 SP = PL_stack_base + POPMARK;
1934
1935 if (!(PL_op->op_flags & OPf_STACKED))
1936 {
1937 /* ampersand-form of call, use @_ instead of stack */
1938 AV *av = GvAV (PL_defgv);
1939 arg = AvARRAY (av);
1940 items = AvFILLp (av) + 1;
1941 }
1942
1943 PUTBACK;
1944
1945 ((coro_slf_cb)CvXSUBANY (GvCV (gv)).any_ptr) (aTHX_ &slf_frame, arg, items);
1946 }
1947
1948 /* now interpret the slf_frame */
1949 /* we use a callback system not to make the code needlessly */
1950 /* complicated, but so we can run multiple perl coros from one cctx */
1951
1952 do
1953 {
1124 struct transfer_args ta; 1954 struct coro_transfer_args ta;
1125 1955
1126 if (prepare_cede_notself (&ta)) 1956 slf_frame.prepare (aTHX_ &ta);
1127 {
1128 TRANSFER (ta); 1957 TRANSFER (ta, 0);
1129 return 1; 1958
1959 checkmark = PL_stack_sp - PL_stack_base;
1960 }
1961 while (slf_frame.check (aTHX_ &slf_frame));
1962
1963 {
1964 dSP;
1965 SV **bot = PL_stack_base + checkmark;
1966 int gimme = GIMME_V;
1967
1968 slf_frame.prepare = 0; /* signal pp_slf that we need a new frame */
1969
1970 /* make sure we put something on the stack in scalar context */
1971 if (gimme == G_SCALAR)
1972 {
1973 if (sp == bot)
1974 XPUSHs (&PL_sv_undef);
1975
1976 SP = bot + 1;
1130 } 1977 }
1131 else
1132 return 0;
1133}
1134 1978
1979 PUTBACK;
1980 }
1981
1982 return NORMAL;
1983}
1984
1985static void
1986api_execute_slf (pTHX_ CV *cv, coro_slf_cb init_cb, SV **arg, int items)
1987{
1988 assert (("FATAL: SLF call with illegal CV value", !CvANON (cv)));
1989
1990 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB]
1991 && PL_op->op_ppaddr != pp_slf)
1992 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught");
1993
1994 if (items > 3)
1995 croak ("Coro only supports up to three arguments to SLF functions currently, caught");
1996
1997 CvFLAGS (cv) |= CVf_SLF;
1998 CvXSUBANY (cv).any_ptr = (void *)init_cb;
1999 slf_cv = cv;
2000
2001 /* we patch the op, and then re-run the whole call */
2002 /* we have to put the same argument on the stack for this to work */
2003 /* and this will be done by pp_restore */
2004 slf_restore.op_next = (OP *)&slf_restore;
2005 slf_restore.op_type = OP_NULL;
2006 slf_restore.op_ppaddr = pp_restore;
2007 slf_restore.op_first = PL_op;
2008
2009 slf_arg0 = items > 0 ? SvREFCNT_inc (arg [0]) : 0;
2010 slf_arg1 = items > 1 ? SvREFCNT_inc (arg [1]) : 0;
2011 slf_arg2 = items > 2 ? SvREFCNT_inc (arg [2]) : 0;
2012
2013 PL_op->op_ppaddr = pp_slf;
2014
2015 PL_op = (OP *)&slf_restore;
2016}
2017
1135MODULE = Coro::State PACKAGE = Coro::State 2018MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1136 2019
1137PROTOTYPES: DISABLE 2020PROTOTYPES: DISABLE
1138 2021
1139BOOT: 2022BOOT:
1140{ 2023{
1141#ifdef USE_ITHREADS 2024#ifdef USE_ITHREADS
1142 MUTEX_INIT (&coro_mutex); 2025 MUTEX_INIT (&coro_lock);
2026# if CORO_PTHREAD
2027 coro_thx = PERL_GET_CONTEXT;
2028# endif
1143#endif 2029#endif
1144 BOOT_PAGESIZE; 2030 BOOT_PAGESIZE;
1145 2031
2032 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
2033 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
2034
2035 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2036 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2037 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
2038
2039 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
2040 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
2041 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
2042
1146 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 2043 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1147 2044
2045 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
2046 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1148 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV)); 2047 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1149 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1150 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1151 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1152 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL)); 2048 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1153 2049
1154 main_mainstack = PL_mainstack; 2050 main_mainstack = PL_mainstack;
2051 main_top_env = PL_top_env;
1155 2052
2053 while (main_top_env->je_prev)
2054 main_top_env = main_top_env->je_prev;
2055
1156 coroapi.ver = CORO_API_VERSION; 2056 coroapi.ver = CORO_API_VERSION;
2057 coroapi.rev = CORO_API_REVISION;
2058
1157 coroapi.transfer = api_transfer; 2059 coroapi.transfer = api_transfer;
2060
2061 coroapi.sv_state = SvSTATE_;
2062 coroapi.execute_slf = api_execute_slf;
2063 coroapi.prepare_nop = prepare_nop;
2064 coroapi.prepare_schedule = prepare_schedule;
2065 coroapi.prepare_cede = prepare_cede;
2066 coroapi.prepare_cede_notself = prepare_cede_notself;
2067
2068 {
2069 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2070
2071 if (!svp) croak ("Time::HiRes is required");
2072 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2073
2074 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2075 }
1158 2076
1159 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2077 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1160} 2078}
1161 2079
1162SV * 2080SV *
1163new (char *klass, ...) 2081new (char *klass, ...)
1164 CODE: 2082 CODE:
1165{ 2083{
1166 struct coro *coro; 2084 struct coro *coro;
2085 MAGIC *mg;
1167 HV *hv; 2086 HV *hv;
1168 int i; 2087 int i;
1169 2088
1170 Newz (0, coro, 1, struct coro); 2089 Newz (0, coro, 1, struct coro);
1171 coro->args = newAV (); 2090 coro->args = newAV ();
1172 coro->save = CORO_SAVE_ALL;
1173 coro->flags = CF_NEW; 2091 coro->flags = CF_NEW;
1174 2092
2093 if (coro_first) coro_first->prev = coro;
2094 coro->next = coro_first;
2095 coro_first = coro;
2096
1175 hv = newHV (); 2097 coro->hv = hv = newHV ();
1176 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 2098 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2099 mg->mg_flags |= MGf_DUP;
1177 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2100 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1178 2101
2102 av_extend (coro->args, items - 1);
1179 for (i = 1; i < items; i++) 2103 for (i = 1; i < items; i++)
1180 av_push (coro->args, newSVsv (ST (i))); 2104 av_push (coro->args, newSVsv (ST (i)));
1181} 2105}
1182 OUTPUT: 2106 OUTPUT:
1183 RETVAL 2107 RETVAL
1184 2108
1185int
1186save (SV *coro, int new_save = -1)
1187 CODE:
1188 RETVAL = api_save (coro, new_save);
1189 OUTPUT:
1190 RETVAL
1191
1192void 2109void
1193_set_stacklevel (...) 2110_set_stacklevel (...)
1194 ALIAS: 2111 CODE:
1195 Coro::State::transfer = 1 2112 api_execute_slf (aTHX_ cv, slf_init_set_stacklevel, &ST (0), items);
1196 Coro::schedule = 2
1197 Coro::cede = 3
1198 Coro::cede_notself = 4
1199 CODE:
1200{
1201 struct transfer_args ta;
1202 2113
1203 switch (ix) 2114void
1204 { 2115transfer (...)
1205 case 0: 2116 CODE:
1206 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 2117 api_execute_slf (aTHX_ cv, slf_init_transfer, &ST (0), items);
1207 ta.next = 0;
1208 break;
1209
1210 case 1:
1211 if (items != 2)
1212 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1213
1214 prepare_transfer (&ta, ST (0), ST (1));
1215 break;
1216
1217 case 2:
1218 prepare_schedule (&ta);
1219 break;
1220
1221 case 3:
1222 prepare_cede (&ta);
1223 break;
1224
1225 case 4:
1226 if (!prepare_cede_notself (&ta))
1227 XSRETURN_EMPTY;
1228
1229 break;
1230 }
1231
1232 BARRIER;
1233 TRANSFER (ta);
1234
1235 if (GIMME_V != G_VOID && ta.next != ta.prev)
1236 XSRETURN_YES;
1237}
1238 2118
1239bool 2119bool
1240_destroy (SV *coro_sv) 2120_destroy (SV *coro_sv)
1241 CODE: 2121 CODE:
1242 RETVAL = coro_state_destroy (SvSTATE (coro_sv)); 2122 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1243 OUTPUT: 2123 OUTPUT:
1244 RETVAL 2124 RETVAL
1245 2125
1246void 2126void
1247_exit (code) 2127_exit (int code)
1248 int code
1249 PROTOTYPE: $ 2128 PROTOTYPE: $
1250 CODE: 2129 CODE:
1251 _exit (code); 2130 _exit (code);
2131
2132int
2133cctx_stacksize (int new_stacksize = 0)
2134 CODE:
2135 RETVAL = cctx_stacksize;
2136 if (new_stacksize)
2137 {
2138 cctx_stacksize = new_stacksize;
2139 ++cctx_gen;
2140 }
2141 OUTPUT:
2142 RETVAL
2143
2144int
2145cctx_max_idle (int max_idle = 0)
2146 CODE:
2147 RETVAL = cctx_max_idle;
2148 if (max_idle > 1)
2149 cctx_max_idle = max_idle;
2150 OUTPUT:
2151 RETVAL
1252 2152
1253int 2153int
1254cctx_count () 2154cctx_count ()
1255 CODE: 2155 CODE:
1256 RETVAL = cctx_count; 2156 RETVAL = cctx_count;
… …
1262 CODE: 2162 CODE:
1263 RETVAL = cctx_idle; 2163 RETVAL = cctx_idle;
1264 OUTPUT: 2164 OUTPUT:
1265 RETVAL 2165 RETVAL
1266 2166
2167void
2168list ()
2169 PPCODE:
2170{
2171 struct coro *coro;
2172 for (coro = coro_first; coro; coro = coro->next)
2173 if (coro->hv)
2174 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
2175}
2176
2177void
2178call (Coro::State coro, SV *coderef)
2179 ALIAS:
2180 eval = 1
2181 CODE:
2182{
2183 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2184 {
2185 struct coro temp;
2186
2187 if (!(coro->flags & CF_RUNNING))
2188 {
2189 PUTBACK;
2190 save_perl (aTHX_ &temp);
2191 load_perl (aTHX_ coro);
2192 }
2193
2194 {
2195 dSP;
2196 ENTER;
2197 SAVETMPS;
2198 PUTBACK;
2199 PUSHSTACK;
2200 PUSHMARK (SP);
2201
2202 if (ix)
2203 eval_sv (coderef, 0);
2204 else
2205 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
2206
2207 POPSTACK;
2208 SPAGAIN;
2209 FREETMPS;
2210 LEAVE;
2211 PUTBACK;
2212 }
2213
2214 if (!(coro->flags & CF_RUNNING))
2215 {
2216 save_perl (aTHX_ coro);
2217 load_perl (aTHX_ &temp);
2218 SPAGAIN;
2219 }
2220 }
2221}
2222
2223SV *
2224is_ready (Coro::State coro)
2225 PROTOTYPE: $
2226 ALIAS:
2227 is_ready = CF_READY
2228 is_running = CF_RUNNING
2229 is_new = CF_NEW
2230 is_destroyed = CF_DESTROYED
2231 CODE:
2232 RETVAL = boolSV (coro->flags & ix);
2233 OUTPUT:
2234 RETVAL
2235
2236void
2237throw (Coro::State self, SV *throw = &PL_sv_undef)
2238 PROTOTYPE: $;$
2239 CODE:
2240 SvREFCNT_dec (self->throw);
2241 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2242
2243void
2244api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2245 C_ARGS: aTHX_ coro, flags
2246
2247SV *
2248has_cctx (Coro::State coro)
2249 PROTOTYPE: $
2250 CODE:
2251 RETVAL = boolSV (!!coro->cctx);
2252 OUTPUT:
2253 RETVAL
2254
2255int
2256is_traced (Coro::State coro)
2257 PROTOTYPE: $
2258 CODE:
2259 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
2260 OUTPUT:
2261 RETVAL
2262
2263UV
2264rss (Coro::State coro)
2265 PROTOTYPE: $
2266 ALIAS:
2267 usecount = 1
2268 CODE:
2269 switch (ix)
2270 {
2271 case 0: RETVAL = coro_rss (aTHX_ coro); break;
2272 case 1: RETVAL = coro->usecount; break;
2273 }
2274 OUTPUT:
2275 RETVAL
2276
2277void
2278force_cctx ()
2279 CODE:
2280 struct coro *coro = SvSTATE (coro_current);
2281 coro->cctx->idle_sp = 0;
2282
2283void
2284swap_defsv (Coro::State self)
2285 PROTOTYPE: $
2286 ALIAS:
2287 swap_defav = 1
2288 CODE:
2289 if (!self->slot)
2290 croak ("cannot swap state with coroutine that has no saved state,");
2291 else
2292 {
2293 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2294 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2295
2296 SV *tmp = *src; *src = *dst; *dst = tmp;
2297 }
2298
1267MODULE = Coro::State PACKAGE = Coro 2299MODULE = Coro::State PACKAGE = Coro
1268 2300
1269BOOT: 2301BOOT:
1270{ 2302{
1271 int i; 2303 int i;
1272 2304
2305 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2306 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2307 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
2308
2309 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
2310 SvREADONLY_on (coro_current);
2311
1273 coro_stash = gv_stashpv ("Coro", TRUE); 2312 coro_stash = gv_stashpv ("Coro", TRUE);
1274 2313
1275 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 2314 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1276 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 2315 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1277 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 2316 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1278 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 2317 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1279 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 2318 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
1280 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 2319 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
1281 2320
1282 coro_current = get_sv ("Coro::current", FALSE);
1283 SvREADONLY_on (coro_current);
1284
1285 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2321 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1286 coro_ready[i] = newAV (); 2322 coro_ready[i] = newAV ();
1287 2323
1288 { 2324 {
1289 SV *sv = perl_get_sv("Coro::API", 1); 2325 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
1290 2326
1291 coroapi.schedule = api_schedule; 2327 coroapi.schedule = api_schedule;
1292 coroapi.save = api_save;
1293 coroapi.cede = api_cede; 2328 coroapi.cede = api_cede;
1294 coroapi.cede_notself = api_cede_notself; 2329 coroapi.cede_notself = api_cede_notself;
1295 coroapi.ready = api_ready; 2330 coroapi.ready = api_ready;
1296 coroapi.is_ready = api_is_ready; 2331 coroapi.is_ready = api_is_ready;
1297 coroapi.nready = &coro_nready; 2332 coroapi.nready = coro_nready;
1298 coroapi.current = coro_current; 2333 coroapi.current = coro_current;
1299 2334
1300 GCoroAPI = &coroapi; 2335 GCoroAPI = &coroapi;
1301 sv_setiv (sv, (IV)&coroapi); 2336 sv_setiv (sv, (IV)&coroapi);
1302 SvREADONLY_on (sv); 2337 SvREADONLY_on (sv);
1303 } 2338 }
1304} 2339}
2340
2341void
2342schedule (...)
2343 CODE:
2344 api_execute_slf (aTHX_ cv, slf_init_schedule, &ST (0), items);
2345
2346void
2347cede (...)
2348 CODE:
2349 api_execute_slf (aTHX_ cv, slf_init_cede, &ST (0), items);
2350
2351void
2352cede_notself (...)
2353 CODE:
2354 api_execute_slf (aTHX_ cv, slf_init_cede_notself, &ST (0), items);
1305 2355
1306void 2356void
1307_set_current (SV *current) 2357_set_current (SV *current)
1308 PROTOTYPE: $ 2358 PROTOTYPE: $
1309 CODE: 2359 CODE:
1310 SvREFCNT_dec (SvRV (coro_current)); 2360 SvREFCNT_dec (SvRV (coro_current));
1311 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 2361 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
2362
2363void
2364_set_readyhook (SV *hook)
2365 PROTOTYPE: $
2366 CODE:
2367 LOCK;
2368 SvREFCNT_dec (coro_readyhook);
2369 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
2370 UNLOCK;
1312 2371
1313int 2372int
1314prio (Coro::State coro, int newprio = 0) 2373prio (Coro::State coro, int newprio = 0)
1315 ALIAS: 2374 ALIAS:
1316 nice = 1 2375 nice = 1
… …
1334 2393
1335SV * 2394SV *
1336ready (SV *self) 2395ready (SV *self)
1337 PROTOTYPE: $ 2396 PROTOTYPE: $
1338 CODE: 2397 CODE:
1339 RETVAL = boolSV (api_ready (self)); 2398 RETVAL = boolSV (api_ready (aTHX_ self));
1340 OUTPUT:
1341 RETVAL
1342
1343SV *
1344is_ready (SV *self)
1345 PROTOTYPE: $
1346 CODE:
1347 RETVAL = boolSV (api_is_ready (self));
1348 OUTPUT: 2399 OUTPUT:
1349 RETVAL 2400 RETVAL
1350 2401
1351int 2402int
1352nready (...) 2403nready (...)
… …
1354 CODE: 2405 CODE:
1355 RETVAL = coro_nready; 2406 RETVAL = coro_nready;
1356 OUTPUT: 2407 OUTPUT:
1357 RETVAL 2408 RETVAL
1358 2409
2410# for async_pool speedup
2411void
2412_pool_1 (SV *cb)
2413 CODE:
2414{
2415 struct coro *coro = SvSTATE (coro_current);
2416 HV *hv = (HV *)SvRV (coro_current);
2417 AV *defav = GvAV (PL_defgv);
2418 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
2419 AV *invoke_av;
2420 int i, len;
2421
2422 if (!invoke)
2423 {
2424 SV *old = PL_diehook;
2425 PL_diehook = 0;
2426 SvREFCNT_dec (old);
2427 croak ("\3async_pool terminate\2\n");
2428 }
2429
2430 SvREFCNT_dec (coro->saved_deffh);
2431 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2432
2433 hv_store (hv, "desc", sizeof ("desc") - 1,
2434 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2435
2436 invoke_av = (AV *)SvRV (invoke);
2437 len = av_len (invoke_av);
2438
2439 sv_setsv (cb, AvARRAY (invoke_av)[0]);
2440
2441 if (len > 0)
2442 {
2443 av_fill (defav, len - 1);
2444 for (i = 0; i < len; ++i)
2445 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
2446 }
2447
2448 SvREFCNT_dec (invoke);
2449}
2450
2451void
2452_pool_2 (SV *cb)
2453 CODE:
2454{
2455 struct coro *coro = SvSTATE (coro_current);
2456
2457 sv_setsv (cb, &PL_sv_undef);
2458
2459 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2460 coro->saved_deffh = 0;
2461
2462 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2463 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2464 {
2465 SV *old = PL_diehook;
2466 PL_diehook = 0;
2467 SvREFCNT_dec (old);
2468 croak ("\3async_pool terminate\2\n");
2469 }
2470
2471 av_clear (GvAV (PL_defgv));
2472 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
2473 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
2474
2475 coro->prio = 0;
2476
2477 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2478 api_trace (aTHX_ coro_current, 0);
2479
2480 av_push (av_async_pool, newSVsv (coro_current));
2481}
2482
2483#if 0
2484
2485void
2486_generator_call (...)
2487 PROTOTYPE: @
2488 PPCODE:
2489 fprintf (stderr, "call %p\n", CvXSUBANY(cv).any_ptr);
2490 xxxx
2491 abort ();
2492
2493SV *
2494gensub (SV *sub, ...)
2495 PROTOTYPE: &;@
2496 CODE:
2497{
2498 struct coro *coro;
2499 MAGIC *mg;
2500 CV *xcv;
2501 CV *ncv = (CV *)newSV_type (SVt_PVCV);
2502 int i;
2503
2504 CvGV (ncv) = CvGV (cv);
2505 CvFILE (ncv) = CvFILE (cv);
2506
2507 Newz (0, coro, 1, struct coro);
2508 coro->args = newAV ();
2509 coro->flags = CF_NEW;
2510
2511 av_extend (coro->args, items - 1);
2512 for (i = 1; i < items; i++)
2513 av_push (coro->args, newSVsv (ST (i)));
2514
2515 CvISXSUB_on (ncv);
2516 CvXSUBANY (ncv).any_ptr = (void *)coro;
2517
2518 xcv = GvCV (gv_fetchpv ("Coro::_generator_call", 0, SVt_PVCV));
2519
2520 CvXSUB (ncv) = CvXSUB (xcv);
2521 CvANON_on (ncv);
2522
2523 mg = sv_magicext ((SV *)ncv, 0, CORO_MAGIC_type_state, &coro_gensub_vtbl, (char *)coro, 0);
2524 RETVAL = newRV_noinc ((SV *)ncv);
2525}
2526 OUTPUT:
2527 RETVAL
2528
2529#endif
2530
2531
1359MODULE = Coro::State PACKAGE = Coro::AIO 2532MODULE = Coro::State PACKAGE = Coro::AIO
1360 2533
1361SV * 2534void
1362_get_state () 2535_get_state (SV *self)
1363 CODE: 2536 PPCODE:
1364{ 2537{
1365 struct io_state *data; 2538 AV *defav = GvAV (PL_defgv);
1366 2539 AV *av = newAV ();
2540 int i;
1367 RETVAL = newSV (sizeof (struct io_state)); 2541 SV *data_sv = newSV (sizeof (struct io_state));
1368 data = (struct io_state *)SvPVX (RETVAL); 2542 struct io_state *data = (struct io_state *)SvPVX (data_sv);
1369 SvCUR_set (RETVAL, sizeof (struct io_state)); 2543 SvCUR_set (data_sv, sizeof (struct io_state));
1370 SvPOK_only (RETVAL); 2544 SvPOK_only (data_sv);
1371 2545
1372 data->errorno = errno; 2546 data->errorno = errno;
1373 data->laststype = PL_laststype; 2547 data->laststype = PL_laststype;
1374 data->laststatval = PL_laststatval; 2548 data->laststatval = PL_laststatval;
1375 data->statcache = PL_statcache; 2549 data->statcache = PL_statcache;
2550
2551 av_extend (av, AvFILLp (defav) + 1 + 1);
2552
2553 for (i = 0; i <= AvFILLp (defav); ++i)
2554 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i]));
2555
2556 av_push (av, data_sv);
2557
2558 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2559
2560 api_ready (aTHX_ self);
1376} 2561}
1377 OUTPUT:
1378 RETVAL
1379 2562
1380void 2563void
1381_set_state (char *data_) 2564_set_state (SV *state)
1382 PROTOTYPE: $ 2565 PROTOTYPE: $
1383 CODE: 2566 PPCODE:
1384{ 2567{
1385 struct io_state *data = (void *)data_; 2568 AV *av = (AV *)SvRV (state);
2569 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]);
2570 int i;
1386 2571
1387 errno = data->errorno; 2572 errno = data->errorno;
1388 PL_laststype = data->laststype; 2573 PL_laststype = data->laststype;
1389 PL_laststatval = data->laststatval; 2574 PL_laststatval = data->laststatval;
1390 PL_statcache = data->statcache; 2575 PL_statcache = data->statcache;
1391}
1392 2576
2577 EXTEND (SP, AvFILLp (av));
2578 for (i = 0; i < AvFILLp (av); ++i)
2579 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2580}
2581
2582
2583MODULE = Coro::State PACKAGE = Coro::AnyEvent
2584
2585BOOT:
2586 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2587
2588SV *
2589_schedule (...)
2590 PROTOTYPE: @
2591 CODE:
2592{
2593 static int incede;
2594
2595 api_cede_notself (aTHX);
2596
2597 ++incede;
2598 while (coro_nready >= incede && api_cede (aTHX))
2599 ;
2600
2601 sv_setsv (sv_activity, &PL_sv_undef);
2602 if (coro_nready >= incede)
2603 {
2604 PUSHMARK (SP);
2605 PUTBACK;
2606 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2607 SPAGAIN;
2608 }
2609
2610 --incede;
2611}
2612
2613
2614MODULE = Coro::State PACKAGE = PerlIO::cede
2615
2616BOOT:
2617 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2618

Diff Legend

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