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.97 by root, Sun Nov 26 21:21:14 2006 UTC vs.
Revision 1.212 by root, Wed Oct 10 04:21:33 2007 UTC

1#include "libcoro/coro.c"
2
1#define PERL_NO_GET_CONTEXT 3#define PERL_NO_GET_CONTEXT
2 4#define PERL_EXT
3#include "libcoro/coro.c"
4 5
5#include "EXTERN.h" 6#include "EXTERN.h"
6#include "perl.h" 7#include "perl.h"
7#include "XSUB.h" 8#include "XSUB.h"
8 9
9#include "patchlevel.h" 10#include "patchlevel.h"
10 11
11#if PERL_VERSION < 6 12#include <stdio.h>
13#include <errno.h>
14#include <assert.h>
15#include <inttypes.h> /* portable stdint.h */
16
17#ifdef HAVE_MMAP
18# include <unistd.h>
19# include <sys/mman.h>
20# ifndef MAP_ANONYMOUS
21# ifdef MAP_ANON
22# define MAP_ANONYMOUS MAP_ANON
23# else
24# undef HAVE_MMAP
25# endif
26# endif
27# include <limits.h>
28# ifndef PAGESIZE
29# define PAGESIZE pagesize
30# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
31static long pagesize;
32# else
33# define BOOT_PAGESIZE (void)0
34# endif
35#else
36# define PAGESIZE 0
37# define BOOT_PAGESIZE (void)0
38#endif
39
40#if CORO_USE_VALGRIND
41# include <valgrind/valgrind.h>
42# define REGISTER_STACK(cctx,start,end) (cctx)->valgrind_id = VALGRIND_STACK_REGISTER ((start), (end))
43#else
44# define REGISTER_STACK(cctx,start,end)
45#endif
46
47/* the maximum number of idle cctx that will be pooled */
48#define MAX_IDLE_CCTX 8
49
50#define PERL_VERSION_ATLEAST(a,b,c) \
51 (PERL_REVISION > (a) \
52 || (PERL_REVISION == (a) \
53 && (PERL_VERSION > (b) \
54 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c)))))
55
56#if !PERL_VERSION_ATLEAST (5,6,0)
12# ifndef PL_ppaddr 57# ifndef PL_ppaddr
13# define PL_ppaddr ppaddr 58# define PL_ppaddr ppaddr
14# endif 59# endif
15# ifndef call_sv 60# ifndef call_sv
16# define call_sv perl_call_sv 61# define call_sv perl_call_sv
27# ifndef IS_PADCONST 72# ifndef IS_PADCONST
28# define IS_PADCONST(v) 0 73# define IS_PADCONST(v) 0
29# endif 74# endif
30#endif 75#endif
31 76
32#include <stdio.h> 77/* 5.8.7 */
33#include <errno.h> 78#ifndef SvRV_set
79# define SvRV_set(s,v) SvRV(s) = (v)
80#endif
81
82/* 5.8.8 */
83#ifndef GV_NOTQUAL
84# define GV_NOTQUAL 0
85#endif
86#ifndef newSV
87# define newSV(l) NEWSV(0,l)
88#endif
34 89
35#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 90#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
36# undef STACKGUARD 91# undef CORO_STACKGUARD
37#endif
38
39#ifndef STACKGUARD
40# define STACKGUARD 0
41#endif
42
43#ifdef HAVE_MMAP
44# include <unistd.h>
45# include <sys/mman.h>
46# ifndef MAP_ANONYMOUS
47# ifdef MAP_ANON
48# define MAP_ANONYMOUS MAP_ANON
49# else
50# undef HAVE_MMAP
51# endif
52# endif 92#endif
53# include <limits.h> 93
54# ifndef PAGESIZE 94#ifndef CORO_STACKGUARD
55# define PAGESIZE pagesize 95# define CORO_STACKGUARD 0
56# define BOOT_PAGESIZE pagesize = sysconf (_SC_PAGESIZE)
57static long pagesize;
58# else
59# define BOOT_PAGESIZE
60# endif 96#endif
61#endif
62 97
63/* The next macro should declare a variable stacklevel that contains and approximation 98/* prefer perl internal functions over our own? */
64 * to the current C stack pointer. Its property is that it changes with each call 99#ifndef CORO_PREFER_PERL_FUNCTIONS
65 * and should be unique. */ 100# define CORO_PREFER_PERL_FUNCTIONS 0
101#endif
102
103/* The next macros try to return the current stack pointer, in an as
104 * portable way as possible. */
66#define dSTACKLEVEL int stacklevel 105#define dSTACKLEVEL volatile char stacklevel
67#define STACKLEVEL ((void *)&stacklevel) 106#define STACKLEVEL ((void *)&stacklevel)
68 107
69#define IN_DESTRUCT (PL_main_cv == Nullcv) 108#define IN_DESTRUCT (PL_main_cv == Nullcv)
70 109
110#if __GNUC__ >= 3
111# define attribute(x) __attribute__(x)
112# define BARRIER __asm__ __volatile__ ("" : : : "memory")
113# define expect(expr,value) __builtin_expect ((expr),(value))
114#else
115# define attribute(x)
116# define BARRIER
117# define expect(expr,value) (expr)
118#endif
119
120#define expect_false(expr) expect ((expr) != 0, 0)
121#define expect_true(expr) expect ((expr) != 0, 1)
122
123#define NOINLINE attribute ((noinline))
124
71#include "CoroAPI.h" 125#include "CoroAPI.h"
72
73#define TRANSFER_SET_STACKLEVEL 0x8bfbfbfb /* magic cookie */
74 126
75#ifdef USE_ITHREADS 127#ifdef USE_ITHREADS
76static perl_mutex coro_mutex; 128static perl_mutex coro_mutex;
77# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 129# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
78# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 130# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
79#else 131#else
80# define LOCK (void)0 132# define LOCK (void)0
81# define UNLOCK (void)0 133# define UNLOCK (void)0
82#endif 134#endif
83 135
136/* helper storage struct for Coro::AIO */
137struct io_state
138{
139 int errorno;
140 I32 laststype;
141 int laststatval;
142 Stat_t statcache;
143};
144
145static size_t coro_stacksize = CORO_STACKSIZE;
84static struct CoroAPI coroapi; 146static struct CoroAPI coroapi;
85static AV *main_mainstack; /* used to differentiate between $main and others */ 147static AV *main_mainstack; /* used to differentiate between $main and others */
148static JMPENV *main_top_env;
86static HV *coro_state_stash, *coro_stash; 149static HV *coro_state_stash, *coro_stash;
87static SV *coro_mortal; /* will be freed after next transfer */ 150static SV *coro_mortal; /* will be freed after next transfer */
88 151
152static GV *irsgv; /* $/ */
153static GV *stdoutgv; /* *STDOUT */
154
155static HV *hv_sig; /* %SIG */
156static SV *sv_diehook;
157static SV *sv_warnhook;
158
159/* async_pool helper stuff */
160static SV *sv_pool_rss;
161static SV *sv_pool_size;
162static AV *av_async_pool;
163
164static struct coro_cctx *cctx_first;
165static int cctx_count, cctx_idle;
166
167enum {
168 CC_MAPPED = 0x01,
169 CC_NOREUSE = 0x02, /* throw this away after tracing */
170 CC_TRACE = 0x04,
171 CC_TRACE_SUB = 0x08, /* trace sub calls */
172 CC_TRACE_LINE = 0x10, /* trace each statement */
173 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
174};
175
89/* this is a structure representing a c-level coroutine */ 176/* this is a structure representing a c-level coroutine */
90typedef struct coro_stack { 177typedef struct coro_cctx {
91 struct coro_stack *next; 178 struct coro_cctx *next;
92 179
93 /* the stack */ 180 /* the stack */
94 void *sptr; 181 void *sptr;
95 long ssize; /* positive == mmap, otherwise malloc */ 182 size_t ssize;
96 183
97 /* cpu state */ 184 /* cpu state */
98 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
99 JMPENV *top_env; 187 JMPENV *top_env;
100 coro_context cctx; 188 coro_context cctx;
101} coro_stack; 189
190#if CORO_USE_VALGRIND
191 int valgrind_id;
192#endif
193 unsigned char flags;
194} coro_cctx;
195
196enum {
197 CF_RUNNING = 0x0001, /* coroutine is running */
198 CF_READY = 0x0002, /* coroutine is ready */
199 CF_NEW = 0x0004, /* has never been switched to */
200 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
201};
202
203/* the structure where most of the perl state is stored, overlaid on the cxstack */
204typedef struct {
205 SV *defsv;
206 AV *defav;
207 SV *errsv;
208 SV *irsgv;
209#define VAR(name,type) type name;
210# include "state.h"
211#undef VAR
212} perl_slots;
213
214#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
102 215
103/* this is a structure representing a perl-level coroutine */ 216/* this is a structure representing a perl-level coroutine */
104struct coro { 217struct coro {
105 /* the c coroutine allocated to this perl coroutine, if any */ 218 /* the c coroutine allocated to this perl coroutine, if any */
106 coro_stack *stack; 219 coro_cctx *cctx;
107 220
108 /* data associated with this coroutine (initial args) */ 221 /* process data */
109 AV *args;
110 int refcnt;
111
112 /* optionally saved, might be zero */
113 AV *defav;
114 SV *defsv;
115 SV *errsv;
116
117 /* saved global state not related to stacks */
118 U8 dowarn;
119 I32 in_eval;
120
121 /* the stacks and related info (callchain etc..) */
122 PERL_SI *curstackinfo;
123 AV *curstack;
124 AV *mainstack; 222 AV *mainstack;
125 SV **stack_sp; 223 perl_slots *slot; /* basically the saved sp */
126 OP *op; 224
127 SV **curpad; 225 AV *args; /* data associated with this coroutine (initial args) */
128 AV *comppad; 226 int refcnt; /* coroutines are refcounted, yes */
129 CV *compcv; 227 int flags; /* CF_ flags */
130 SV **stack_base; 228 HV *hv; /* the perl hash associated with this coro, if any */
131 SV **stack_max; 229
132 SV **tmps_stack; 230 /* statistics */
133 I32 tmps_floor; 231 int usecount; /* number of transfers to this coro */
134 I32 tmps_ix;
135 I32 tmps_max;
136 I32 *markstack;
137 I32 *markstack_ptr;
138 I32 *markstack_max;
139 I32 *scopestack;
140 I32 scopestack_ix;
141 I32 scopestack_max;
142 ANY *savestack;
143 I32 savestack_ix;
144 I32 savestack_max;
145 OP **retstack;
146 I32 retstack_ix;
147 I32 retstack_max;
148 PMOP *curpm;
149 COP *curcop;
150 232
151 /* coro process data */ 233 /* coro process data */
152 int prio; 234 int prio;
235 SV *throw; /* exception to be thrown */
236
237 /* async_pool */
238 SV *saved_deffh;
239
240 /* linked list */
241 struct coro *next, *prev;
153}; 242};
154 243
155typedef struct coro *Coro__State; 244typedef struct coro *Coro__State;
156typedef struct coro *Coro__State_or_hashref; 245typedef struct coro *Coro__State_or_hashref;
157 246
247/** Coro ********************************************************************/
248
249#define PRIO_MAX 3
250#define PRIO_HIGH 1
251#define PRIO_NORMAL 0
252#define PRIO_LOW -1
253#define PRIO_IDLE -3
254#define PRIO_MIN -4
255
256/* for Coro.pm */
257static SV *coro_current;
258static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
259static int coro_nready;
260static struct coro *coro_first;
261
262/** lowlevel stuff **********************************************************/
263
264static SV *
265coro_get_sv (const char *name, int create)
266{
267#if PERL_VERSION_ATLEAST (5,9,0)
268 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
269 get_sv (name, create);
270#endif
271 return get_sv (name, create);
272}
273
274static AV *
275coro_get_av (const char *name, int create)
276{
277#if PERL_VERSION_ATLEAST (5,9,0)
278 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
279 get_av (name, create);
280#endif
281 return get_av (name, create);
282}
283
284static HV *
285coro_get_hv (const char *name, int create)
286{
287#if PERL_VERSION_ATLEAST (5,9,0)
288 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
289 get_hv (name, create);
290#endif
291 return get_hv (name, create);
292}
293
158static AV * 294static AV *
159coro_clone_padlist (pTHX_ CV *cv) 295coro_clone_padlist (pTHX_ CV *cv)
160{ 296{
161 AV *padlist = CvPADLIST (cv); 297 AV *padlist = CvPADLIST (cv);
162 AV *newpadlist, *newpad; 298 AV *newpadlist, *newpad;
163 299
164 newpadlist = newAV (); 300 newpadlist = newAV ();
165 AvREAL_off (newpadlist); 301 AvREAL_off (newpadlist);
166#if PERL_VERSION < 9 302#if PERL_VERSION_ATLEAST (5,9,0)
303 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
304#else
167 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 305 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
168#else
169 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
170#endif 306#endif
171 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 307 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
172 --AvFILLp (padlist); 308 --AvFILLp (padlist);
173 309
174 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 310 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE)));
218 354
219#define PERL_MAGIC_coro PERL_MAGIC_ext 355#define PERL_MAGIC_coro PERL_MAGIC_ext
220 356
221static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 357static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
222 358
359#define CORO_MAGIC(cv) \
360 SvMAGIC (cv) \
361 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \
362 ? SvMAGIC (cv) \
363 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
364 : 0
365
366static struct coro *
367SvSTATE_ (pTHX_ SV *coro)
368{
369 HV *stash;
370 MAGIC *mg;
371
372 if (SvROK (coro))
373 coro = SvRV (coro);
374
375 if (expect_false (SvTYPE (coro) != SVt_PVHV))
376 croak ("Coro::State object required");
377
378 stash = SvSTASH (coro);
379 if (expect_false (stash != coro_stash && stash != coro_state_stash))
380 {
381 /* very slow, but rare, check */
382 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
383 croak ("Coro::State object required");
384 }
385
386 mg = CORO_MAGIC (coro);
387 return (struct coro *)mg->mg_ptr;
388}
389
390#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
391
223/* the next two functions merely cache the padlists */ 392/* the next two functions merely cache the padlists */
224static void 393static void
225get_padlist (pTHX_ CV *cv) 394get_padlist (pTHX_ CV *cv)
226{ 395{
227 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 396 MAGIC *mg = CORO_MAGIC (cv);
397 AV *av;
228 398
229 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0) 399 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
230 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj); 400 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
231 else 401 else
232 { 402 {
233#if 0 403#if CORO_PREFER_PERL_FUNCTIONS
234 /* this is probably cleaner, but also slower? */ 404 /* this is probably cleaner, but also slower? */
235 CV *cp = Perl_cv_clone (aTHX_ cv); 405 CV *cp = Perl_cv_clone (cv);
236 CvPADLIST (cv) = CvPADLIST (cp); 406 CvPADLIST (cv) = CvPADLIST (cp);
237 CvPADLIST (cp) = 0; 407 CvPADLIST (cp) = 0;
238 SvREFCNT_dec (cp); 408 SvREFCNT_dec (cp);
239#else 409#else
240 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv); 410 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
243} 413}
244 414
245static void 415static void
246put_padlist (pTHX_ CV *cv) 416put_padlist (pTHX_ CV *cv)
247{ 417{
248 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 418 MAGIC *mg = CORO_MAGIC (cv);
419 AV *av;
249 420
250 if (!mg) 421 if (expect_false (!mg))
251 { 422 {
252 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 423 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
253 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 424 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
254 mg->mg_virtual = &vtbl_coro; 425 mg->mg_virtual = &vtbl_coro;
255 mg->mg_obj = (SV *)newAV (); 426 mg->mg_obj = (SV *)newAV ();
256 } 427 }
257 428
258 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv)); 429 av = (AV *)mg->mg_obj;
259}
260 430
261#define SB do { 431 if (expect_false (AvFILLp (av) >= AvMAX (av)))
262#define SE } while (0) 432 av_extend (av, AvMAX (av) + 1);
263 433
264#define LOAD(state) load_state(aTHX_ (state)); 434 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
265#define SAVE(state,flags) save_state(aTHX_ (state),(flags)); 435}
266 436
267#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE 437/** load & save, init *******************************************************/
268 438
269static void 439static void
270load_state(pTHX_ Coro__State c) 440load_perl (pTHX_ Coro__State c)
271{ 441{
272 PL_dowarn = c->dowarn; 442 perl_slots *slot = c->slot;
273 PL_in_eval = c->in_eval; 443 c->slot = 0;
274 444
275 PL_curstackinfo = c->curstackinfo;
276 PL_curstack = c->curstack;
277 PL_mainstack = c->mainstack; 445 PL_mainstack = c->mainstack;
278 PL_stack_sp = c->stack_sp;
279 PL_op = c->op;
280 PL_curpad = c->curpad;
281 PL_comppad = c->comppad;
282 PL_compcv = c->compcv;
283 PL_stack_base = c->stack_base;
284 PL_stack_max = c->stack_max;
285 PL_tmps_stack = c->tmps_stack;
286 PL_tmps_floor = c->tmps_floor;
287 PL_tmps_ix = c->tmps_ix;
288 PL_tmps_max = c->tmps_max;
289 PL_markstack = c->markstack;
290 PL_markstack_ptr = c->markstack_ptr;
291 PL_markstack_max = c->markstack_max;
292 PL_scopestack = c->scopestack;
293 PL_scopestack_ix = c->scopestack_ix;
294 PL_scopestack_max = c->scopestack_max;
295 PL_savestack = c->savestack;
296 PL_savestack_ix = c->savestack_ix;
297 PL_savestack_max = c->savestack_max;
298#if PERL_VERSION < 9
299 PL_retstack = c->retstack;
300 PL_retstack_ix = c->retstack_ix;
301 PL_retstack_max = c->retstack_max;
302#endif
303 PL_curpm = c->curpm;
304 PL_curcop = c->curcop;
305 446
306 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 447 GvSV (PL_defgv) = slot->defsv;
307 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 448 GvAV (PL_defgv) = slot->defav;
308 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 449 GvSV (PL_errgv) = slot->errsv;
450 GvSV (irsgv) = slot->irsgv;
451
452 #define VAR(name,type) PL_ ## name = slot->name;
453 # include "state.h"
454 #undef VAR
455
456 /*hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);*/
457 /*hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);*/
309 458
310 { 459 {
311 dSP; 460 dSP;
461
312 CV *cv; 462 CV *cv;
313 463
314 /* now do the ugly restore mess */ 464 /* now do the ugly restore mess */
315 while ((cv = (CV *)POPs)) 465 while (expect_true (cv = (CV *)POPs))
316 { 466 {
317 AV *padlist = (AV *)POPs;
318
319 if (padlist)
320 {
321 put_padlist (aTHX_ cv); /* mark this padlist as available */ 467 put_padlist (aTHX_ cv); /* mark this padlist as available */
322 CvPADLIST(cv) = padlist; 468 CvDEPTH (cv) = PTR2IV (POPs);
323 } 469 CvPADLIST (cv) = (AV *)POPs;
324
325 ++CvDEPTH(cv);
326 } 470 }
327 471
328 PUTBACK; 472 PUTBACK;
329 } 473 }
330} 474}
331 475
332static void 476static void
333save_state(pTHX_ Coro__State c, int flags) 477save_perl (pTHX_ Coro__State c)
334{ 478{
335 { 479 {
336 dSP; 480 dSP;
337 I32 cxix = cxstack_ix; 481 I32 cxix = cxstack_ix;
338 PERL_CONTEXT *ccstk = cxstack; 482 PERL_CONTEXT *ccstk = cxstack;
341 /* 485 /*
342 * the worst thing you can imagine happens first - we have to save 486 * the worst thing you can imagine happens first - we have to save
343 * (and reinitialize) all cv's in the whole callchain :( 487 * (and reinitialize) all cv's in the whole callchain :(
344 */ 488 */
345 489
346 PUSHs (Nullsv); 490 XPUSHs (Nullsv);
347 /* this loop was inspired by pp_caller */ 491 /* this loop was inspired by pp_caller */
348 for (;;) 492 for (;;)
349 { 493 {
350 while (cxix >= 0) 494 while (expect_true (cxix >= 0))
351 { 495 {
352 PERL_CONTEXT *cx = &ccstk[cxix--]; 496 PERL_CONTEXT *cx = &ccstk[cxix--];
353 497
354 if (CxTYPE(cx) == CXt_SUB) 498 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
355 { 499 {
356 CV *cv = cx->blk_sub.cv; 500 CV *cv = cx->blk_sub.cv;
501
357 if (CvDEPTH(cv)) 502 if (expect_true (CvDEPTH (cv)))
358 { 503 {
359 EXTEND (SP, CvDEPTH(cv)*2); 504 EXTEND (SP, 3);
360
361 while (--CvDEPTH(cv))
362 {
363 /* this tells the restore code to increment CvDEPTH */
364 PUSHs (Nullsv);
365 PUSHs ((SV *)cv);
366 }
367
368 PUSHs ((SV *)CvPADLIST(cv)); 505 PUSHs ((SV *)CvPADLIST (cv));
506 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
369 PUSHs ((SV *)cv); 507 PUSHs ((SV *)cv);
370 508
509 CvDEPTH (cv) = 0;
371 get_padlist (aTHX_ cv); 510 get_padlist (aTHX_ cv);
372 } 511 }
373 } 512 }
374#ifdef CXt_FORMAT
375 else if (CxTYPE(cx) == CXt_FORMAT)
376 {
377 /* I never used formats, so how should I know how these are implemented? */
378 /* my bold guess is as a simple, plain sub... */
379 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
380 }
381#endif
382 } 513 }
383 514
384 if (top_si->si_type == PERLSI_MAIN) 515 if (expect_true (top_si->si_type == PERLSI_MAIN))
385 break; 516 break;
386 517
387 top_si = top_si->si_prev; 518 top_si = top_si->si_prev;
388 ccstk = top_si->si_cxstack; 519 ccstk = top_si->si_cxstack;
389 cxix = top_si->si_cxix; 520 cxix = top_si->si_cxix;
390 } 521 }
391 522
392 PUTBACK; 523 PUTBACK;
393 } 524 }
394 525
395 c->defav = flags & TRANSFER_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 526 /* allocate some space on the context stack for our purposes */
396 c->defsv = flags & TRANSFER_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 527 /* we manually unroll here, as usually 2 slots is enough */
397 c->errsv = flags & TRANSFER_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 528 if (SLOT_COUNT >= 1) CXINC;
529 if (SLOT_COUNT >= 2) CXINC;
530 if (SLOT_COUNT >= 3) CXINC;
531 {
532 int i;
533 for (i = 3; i < SLOT_COUNT; ++i)
534 CXINC;
535 }
536 cxstack_ix -= SLOT_COUNT; /* undo allocation */
398 537
399 c->dowarn = PL_dowarn;
400 c->in_eval = PL_in_eval;
401
402 c->curstackinfo = PL_curstackinfo;
403 c->curstack = PL_curstack;
404 c->mainstack = PL_mainstack; 538 c->mainstack = PL_mainstack;
405 c->stack_sp = PL_stack_sp; 539
406 c->op = PL_op; 540 {
407 c->curpad = PL_curpad; 541 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
408 c->comppad = PL_comppad; 542
409 c->compcv = PL_compcv; 543 slot->defav = GvAV (PL_defgv);
410 c->stack_base = PL_stack_base; 544 slot->defsv = DEFSV;
411 c->stack_max = PL_stack_max; 545 slot->errsv = ERRSV;
412 c->tmps_stack = PL_tmps_stack; 546 slot->irsgv = GvSV (irsgv);
413 c->tmps_floor = PL_tmps_floor; 547
414 c->tmps_ix = PL_tmps_ix; 548 #define VAR(name,type) slot->name = PL_ ## name;
415 c->tmps_max = PL_tmps_max; 549 # include "state.h"
416 c->markstack = PL_markstack; 550 #undef VAR
417 c->markstack_ptr = PL_markstack_ptr; 551 }
418 c->markstack_max = PL_markstack_max;
419 c->scopestack = PL_scopestack;
420 c->scopestack_ix = PL_scopestack_ix;
421 c->scopestack_max = PL_scopestack_max;
422 c->savestack = PL_savestack;
423 c->savestack_ix = PL_savestack_ix;
424 c->savestack_max = PL_savestack_max;
425#if PERL_VERSION < 9
426 c->retstack = PL_retstack;
427 c->retstack_ix = PL_retstack_ix;
428 c->retstack_max = PL_retstack_max;
429#endif
430 c->curpm = PL_curpm;
431 c->curcop = PL_curcop;
432} 552}
433 553
434/* 554/*
435 * allocate various perl stacks. This is an exact copy 555 * allocate various perl stacks. This is an exact copy
436 * of perl.c:init_stacks, except that it uses less memory 556 * of perl.c:init_stacks, except that it uses less memory
437 * on the (sometimes correct) assumption that coroutines do 557 * on the (sometimes correct) assumption that coroutines do
438 * not usually need a lot of stackspace. 558 * not usually need a lot of stackspace.
439 */ 559 */
560#if CORO_PREFER_PERL_FUNCTIONS
561# define coro_init_stacks init_stacks
562#else
440static void 563static void
441coro_init_stacks (pTHX) 564coro_init_stacks (pTHX)
442{ 565{
443 LOCK; 566 PL_curstackinfo = new_stackinfo(32, 8);
444
445 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
446 PL_curstackinfo->si_type = PERLSI_MAIN; 567 PL_curstackinfo->si_type = PERLSI_MAIN;
447 PL_curstack = PL_curstackinfo->si_stack; 568 PL_curstack = PL_curstackinfo->si_stack;
448 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 569 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
449 570
450 PL_stack_base = AvARRAY(PL_curstack); 571 PL_stack_base = AvARRAY(PL_curstack);
451 PL_stack_sp = PL_stack_base; 572 PL_stack_sp = PL_stack_base;
452 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 573 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
453 574
454 New(50,PL_tmps_stack,96,SV*); 575 New(50,PL_tmps_stack,32,SV*);
455 PL_tmps_floor = -1; 576 PL_tmps_floor = -1;
456 PL_tmps_ix = -1; 577 PL_tmps_ix = -1;
457 PL_tmps_max = 96; 578 PL_tmps_max = 32;
458 579
459 New(54,PL_markstack,16,I32); 580 New(54,PL_markstack,16,I32);
460 PL_markstack_ptr = PL_markstack; 581 PL_markstack_ptr = PL_markstack;
461 PL_markstack_max = PL_markstack + 16; 582 PL_markstack_max = PL_markstack + 16;
462 583
463#ifdef SET_MARK_OFFSET 584#ifdef SET_MARK_OFFSET
464 SET_MARK_OFFSET; 585 SET_MARK_OFFSET;
465#endif 586#endif
466 587
467 New(54,PL_scopestack,16,I32); 588 New(54,PL_scopestack,8,I32);
468 PL_scopestack_ix = 0; 589 PL_scopestack_ix = 0;
469 PL_scopestack_max = 16; 590 PL_scopestack_max = 8;
470 591
471 New(54,PL_savestack,96,ANY); 592 New(54,PL_savestack,24,ANY);
472 PL_savestack_ix = 0; 593 PL_savestack_ix = 0;
473 PL_savestack_max = 96; 594 PL_savestack_max = 24;
474 595
475#if PERL_VERSION < 9 596#if !PERL_VERSION_ATLEAST (5,9,0)
476 New(54,PL_retstack,8,OP*); 597 New(54,PL_retstack,4,OP*);
477 PL_retstack_ix = 0; 598 PL_retstack_ix = 0;
478 PL_retstack_max = 8; 599 PL_retstack_max = 4;
479#endif 600#endif
480
481 UNLOCK;
482} 601}
602#endif
483 603
484/* 604/*
485 * destroy the stacks, the callchain etc... 605 * destroy the stacks, the callchain etc...
486 */ 606 */
487static void 607static void
488destroy_stacks(pTHX) 608coro_destroy_stacks (pTHX)
489{ 609{
490 if (!IN_DESTRUCT)
491 {
492 /* is this ugly, I ask? */
493 LEAVE_SCOPE (0);
494
495 /* sure it is, but more important: is it correct?? :/ */
496 FREETMPS;
497
498 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/
499 }
500
501 while (PL_curstackinfo->si_next) 610 while (PL_curstackinfo->si_next)
502 PL_curstackinfo = PL_curstackinfo->si_next; 611 PL_curstackinfo = PL_curstackinfo->si_next;
503 612
504 while (PL_curstackinfo) 613 while (PL_curstackinfo)
505 { 614 {
506 PERL_SI *p = PL_curstackinfo->si_prev; 615 PERL_SI *p = PL_curstackinfo->si_prev;
507 616
508 { /*D*//*remove*/
509 dSP;
510 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
511 PUTBACK; /* possibly superfluous */
512 }
513
514 if (!IN_DESTRUCT) 617 if (!IN_DESTRUCT)
515 {
516 dounwind (-1);/*D*//*remove*/
517 SvREFCNT_dec (PL_curstackinfo->si_stack); 618 SvREFCNT_dec (PL_curstackinfo->si_stack);
518 }
519 619
520 Safefree (PL_curstackinfo->si_cxstack); 620 Safefree (PL_curstackinfo->si_cxstack);
521 Safefree (PL_curstackinfo); 621 Safefree (PL_curstackinfo);
522 PL_curstackinfo = p; 622 PL_curstackinfo = p;
523 } 623 }
524 624
525 Safefree (PL_tmps_stack); 625 Safefree (PL_tmps_stack);
526 Safefree (PL_markstack); 626 Safefree (PL_markstack);
527 Safefree (PL_scopestack); 627 Safefree (PL_scopestack);
528 Safefree (PL_savestack); 628 Safefree (PL_savestack);
529#if PERL_VERSION < 9 629#if !PERL_VERSION_ATLEAST (5,9,0)
530 Safefree (PL_retstack); 630 Safefree (PL_retstack);
531#endif 631#endif
532} 632}
533 633
534static void 634static size_t
535setup_coro (struct coro *coro) 635coro_rss (pTHX_ struct coro *coro)
636{
637 size_t rss = sizeof (*coro);
638
639 if (coro->mainstack)
640 {
641 perl_slots tmp_slot;
642 perl_slots *slot;
643
644 if (coro->flags & CF_RUNNING)
645 {
646 slot = &tmp_slot;
647
648 #define VAR(name,type) slot->name = PL_ ## name;
649 # include "state.h"
650 #undef VAR
651 }
652 else
653 slot = coro->slot;
654
655 rss += sizeof (slot->curstackinfo);
656 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
657 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
658 rss += slot->tmps_max * sizeof (SV *);
659 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
660 rss += slot->scopestack_max * sizeof (I32);
661 rss += slot->savestack_max * sizeof (ANY);
662
663#if !PERL_VERSION_ATLEAST (5,9,0)
664 rss += slot->retstack_max * sizeof (OP *);
665#endif
666 }
667
668 return rss;
669}
670
671/** coroutine stack handling ************************************************/
672
673static void
674coro_setup (pTHX_ struct coro *coro)
536{ 675{
537 /* 676 /*
538 * emulate part of the perl startup here. 677 * emulate part of the perl startup here.
539 */ 678 */
540 dTHX; 679 coro_init_stacks (aTHX);
680
681 PL_runops = RUNOPS_DEFAULT;
682 PL_curcop = &PL_compiling;
683 PL_in_eval = EVAL_NULL;
684 PL_comppad = 0;
685 PL_curpm = 0;
686 PL_curpad = 0;
687 PL_localizing = 0;
688 PL_dirty = 0;
689 PL_restartop = 0;
690 PL_diehook = 0; hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);
691 PL_warnhook = 0; hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);
692
693 GvSV (PL_defgv) = newSV (0);
694 GvAV (PL_defgv) = coro->args; coro->args = 0;
695 GvSV (PL_errgv) = newSV (0);
696 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
697 PL_rs = newSVsv (GvSV (irsgv));
698 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv);
699
700 {
701 dSP;
702 LOGOP myop;
703
704 Zero (&myop, 1, LOGOP);
705 myop.op_next = Nullop;
706 myop.op_flags = OPf_WANT_VOID;
707
708 PUSHMARK (SP);
709 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
710 PUTBACK;
711 PL_op = (OP *)&myop;
712 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
713 SPAGAIN;
714 }
715
716 /* this newly created coroutine might be run on an existing cctx which most
717 * likely was suspended in set_stacklevel, called from entersub.
718 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
719 * so we ENTER here for symmetry
720 */
721 ENTER;
722}
723
724static void
725coro_destroy (pTHX_ struct coro *coro)
726{
727 if (!IN_DESTRUCT)
728 {
729 /* restore all saved variables and stuff */
730 LEAVE_SCOPE (0);
731 assert (PL_tmps_floor == -1);
732
733 /* free all temporaries */
734 FREETMPS;
735 assert (PL_tmps_ix == -1);
736
737 /* unwind all extra stacks */
738 POPSTACK_TO (PL_mainstack);
739
740 /* unwind main stack */
741 dounwind (-1);
742 }
743
744 SvREFCNT_dec (GvSV (PL_defgv));
745 SvREFCNT_dec (GvAV (PL_defgv));
746 SvREFCNT_dec (GvSV (PL_errgv));
747 SvREFCNT_dec (PL_defoutgv);
748 SvREFCNT_dec (PL_rs);
749 SvREFCNT_dec (GvSV (irsgv));
750
751 SvREFCNT_dec (PL_diehook);
752 SvREFCNT_dec (PL_warnhook);
753
754 SvREFCNT_dec (coro->saved_deffh);
755 SvREFCNT_dec (coro->throw);
756
757 coro_destroy_stacks (aTHX);
758}
759
760static void
761free_coro_mortal (pTHX)
762{
763 if (expect_true (coro_mortal))
764 {
765 SvREFCNT_dec (coro_mortal);
766 coro_mortal = 0;
767 }
768}
769
770static int
771runops_trace (pTHX)
772{
773 COP *oldcop = 0;
774 int oldcxix = -2;
775 struct coro *coro = SvSTATE (coro_current); /* trace cctx is tied to specific coro */
776 coro_cctx *cctx = coro->cctx;
777
778 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
779 {
780 PERL_ASYNC_CHECK ();
781
782 if (cctx->flags & CC_TRACE_ALL)
783 {
784 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB)
785 {
786 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
787 SV **bot, **top;
788 AV *av = newAV (); /* return values */
789 SV **cb;
790 dSP;
791
792 GV *gv = CvGV (cx->blk_sub.cv);
793 SV *fullname = sv_2mortal (newSV (0));
794 if (isGV (gv))
795 gv_efullname3 (fullname, gv, 0);
796
797 bot = PL_stack_base + cx->blk_oldsp + 1;
798 top = cx->blk_gimme == G_ARRAY ? SP + 1
799 : cx->blk_gimme == G_SCALAR ? bot + 1
800 : bot;
801
802 av_extend (av, top - bot);
803 while (bot < top)
804 av_push (av, SvREFCNT_inc (*bot++));
805
806 PL_runops = RUNOPS_DEFAULT;
807 ENTER;
808 SAVETMPS;
809 EXTEND (SP, 3);
810 PUSHMARK (SP);
811 PUSHs (&PL_sv_no);
812 PUSHs (fullname);
813 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
814 PUTBACK;
815 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
816 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
817 SPAGAIN;
818 FREETMPS;
819 LEAVE;
820 PL_runops = runops_trace;
821 }
822
823 if (oldcop != PL_curcop)
824 {
825 oldcop = PL_curcop;
826
827 if (PL_curcop != &PL_compiling)
828 {
829 SV **cb;
830
831 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
832 {
833 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
834
835 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
836 {
837 runops_proc_t old_runops = PL_runops;
838 dSP;
839 GV *gv = CvGV (cx->blk_sub.cv);
840 SV *fullname = sv_2mortal (newSV (0));
841
842 if (isGV (gv))
843 gv_efullname3 (fullname, gv, 0);
844
845 PL_runops = RUNOPS_DEFAULT;
846 ENTER;
847 SAVETMPS;
848 EXTEND (SP, 3);
849 PUSHMARK (SP);
850 PUSHs (&PL_sv_yes);
851 PUSHs (fullname);
852 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
853 PUTBACK;
854 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
855 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
856 SPAGAIN;
857 FREETMPS;
858 LEAVE;
859 PL_runops = runops_trace;
860 }
861
862 oldcxix = cxstack_ix;
863 }
864
865 if (cctx->flags & CC_TRACE_LINE)
866 {
867 dSP;
868
869 PL_runops = RUNOPS_DEFAULT;
870 ENTER;
871 SAVETMPS;
872 EXTEND (SP, 3);
873 PL_runops = RUNOPS_DEFAULT;
874 PUSHMARK (SP);
875 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
876 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
877 PUTBACK;
878 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
879 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
880 SPAGAIN;
881 FREETMPS;
882 LEAVE;
883 PL_runops = runops_trace;
884 }
885 }
886 }
887 }
888 }
889
890 TAINT_NOT;
891 return 0;
892}
893
894/* inject a fake call to Coro::State::_cctx_init into the execution */
895/* _cctx_init should be careful, as it could be called at almost any time */
896/* during execution of a perl program */
897static void NOINLINE
898cctx_prepare (pTHX_ coro_cctx *cctx)
899{
541 dSP; 900 dSP;
542 UNOP myop; 901 LOGOP myop;
543 SV *sub_init = (SV *)get_cv ("Coro::State::coro_init", FALSE);
544 902
545 coro_init_stacks (aTHX); 903 PL_top_env = &PL_start_env;
546 /*PL_curcop = 0;*/
547 /*PL_in_eval = PL_in_eval;*/ /* inherit */
548 SvREFCNT_dec (GvAV (PL_defgv));
549 GvAV (PL_defgv) = coro->args; coro->args = 0;
550 904
551 SPAGAIN; 905 if (cctx->flags & CC_TRACE)
906 PL_runops = runops_trace;
552 907
553 Zero (&myop, 1, UNOP); 908 Zero (&myop, 1, LOGOP);
554 myop.op_next = Nullop; 909 myop.op_next = PL_op;
555 myop.op_flags = OPf_WANT_VOID; 910 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
556 911
912 PUSHMARK (SP);
913 EXTEND (SP, 2);
914 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx))));
915 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
916 PUTBACK;
557 PL_op = (OP *)&myop; 917 PL_op = (OP *)&myop;
558
559 PUSHMARK(SP);
560 XPUSHs (sub_init);
561 PUTBACK;
562 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 918 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
563 SPAGAIN; 919 SPAGAIN;
564
565 ENTER; /* necessary e.g. for dounwind */
566} 920}
567 921
922/*
923 * this is a _very_ stripped down perl interpreter ;)
924 */
568static void 925static void
569free_coro_mortal ()
570{
571 if (coro_mortal)
572 {
573 dTHX;
574
575 SvREFCNT_dec (coro_mortal);
576 coro_mortal = 0;
577 }
578}
579
580static void
581coro_run (void *arg) 926cctx_run (void *arg)
582{ 927{
928 dTHX;
929
930 /* cctx_run is the alternative tail of transfer(), so unlock here. */
931 UNLOCK;
932
933 /* we now skip the entersub that lead to transfer() */
934 PL_op = PL_op->op_next;
935
936 /* inject a fake subroutine call to cctx_init */
937 cctx_prepare (aTHX_ (coro_cctx *)arg);
938
939 /* somebody or something will hit me for both perl_run and PL_restartop */
940 PL_restartop = PL_op;
941 perl_run (PL_curinterp);
942
583 /* 943 /*
584 * this is a _very_ stripped down perl interpreter ;) 944 * If perl-run returns we assume exit() was being called or the coro
945 * fell off the end, which seems to be the only valid (non-bug)
946 * reason for perl_run to return. We try to exit by jumping to the
947 * bootstrap-time "top" top_env, as we cannot restore the "main"
948 * coroutine as Coro has no such concept
585 */ 949 */
586 dTHX;
587 int ret;
588
589 UNLOCK;
590
591 PL_top_env = &PL_start_env; 950 PL_top_env = main_top_env;
592 951 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
593 sv_setiv (get_sv ("Coro::State::cctx_stack", FALSE), PTR2IV ((coro_stack *)arg));
594 sv_setiv (get_sv ("Coro::State::cctx_restartop", FALSE), PTR2IV (PL_op));
595
596 /* continue at cctx_init, without entersub */
597 PL_restartop = CvSTART (get_cv ("Coro::State::cctx_init", FALSE));
598
599 /* somebody will hit me for both perl_run and PL_restartop */
600 ret = perl_run (aTHX_ PERL_GET_CONTEXT);
601 printf ("ret %d\n", ret);//D
602
603 fputs ("FATAL: C coroutine fell over the edge of the world, aborting.\n", stderr);
604 abort ();
605} 952}
606 953
607static coro_stack * 954static coro_cctx *
608stack_new () 955cctx_new ()
609{ 956{
610 coro_stack *stack; 957 coro_cctx *cctx;
958 void *stack_start;
959 size_t stack_size;
611 960
961 ++cctx_count;
962
612 New (0, stack, 1, coro_stack); 963 Newz (0, cctx, 1, coro_cctx);
613 964
614#if HAVE_MMAP 965#if HAVE_MMAP
615
616 stack->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 966 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
617 /* mmap suppsedly does allocate-on-write for us */ 967 /* mmap supposedly does allocate-on-write for us */
618 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 968 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
619 969
620 if (stack->sptr == (void *)-1) 970 if (cctx->sptr != (void *)-1)
621 {
622 perror ("FATAL: unable to mmap stack for coroutine");
623 _exit (EXIT_FAILURE);
624 } 971 {
625
626# if STACKGUARD 972# if CORO_STACKGUARD
627 mprotect (stack->sptr, STACKGUARD * PAGESIZE, PROT_NONE); 973 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
628# endif 974# endif
975 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr;
976 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
977 cctx->flags |= CC_MAPPED;
978 }
979 else
980#endif
981 {
982 cctx->ssize = coro_stacksize * (long)sizeof (long);
983 New (0, cctx->sptr, coro_stacksize, long);
629 984
985 if (!cctx->sptr)
986 {
987 perror ("FATAL: unable to allocate stack for coroutine");
988 _exit (EXIT_FAILURE);
989 }
990
991 stack_start = cctx->sptr;
992 stack_size = cctx->ssize;
993 }
994
995 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
996 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
997
998 return cctx;
999}
1000
1001static void
1002cctx_destroy (coro_cctx *cctx)
1003{
1004 if (!cctx)
1005 return;
1006
1007 --cctx_count;
1008
1009#if CORO_USE_VALGRIND
1010 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1011#endif
1012
1013#if HAVE_MMAP
1014 if (cctx->flags & CC_MAPPED)
1015 munmap (cctx->sptr, cctx->ssize);
1016 else
1017#endif
1018 Safefree (cctx->sptr);
1019
1020 Safefree (cctx);
1021}
1022
1023/* wether this cctx should be destructed */
1024#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
1025
1026static coro_cctx *
1027cctx_get (pTHX)
1028{
1029 while (expect_true (cctx_first))
1030 {
1031 coro_cctx *cctx = cctx_first;
1032 cctx_first = cctx->next;
1033 --cctx_idle;
1034
1035 if (expect_true (!CCTX_EXPIRED (cctx)))
1036 return cctx;
1037
1038 cctx_destroy (cctx);
1039 }
1040
1041 return cctx_new ();
1042}
1043
1044static void
1045cctx_put (coro_cctx *cctx)
1046{
1047 /* free another cctx if overlimit */
1048 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
1049 {
1050 coro_cctx *first = cctx_first;
1051 cctx_first = first->next;
1052 --cctx_idle;
1053
1054 cctx_destroy (first);
1055 }
1056
1057 ++cctx_idle;
1058 cctx->next = cctx_first;
1059 cctx_first = cctx;
1060}
1061
1062/** coroutine switching *****************************************************/
1063
1064static void
1065transfer_check (pTHX_ struct coro *prev, struct coro *next)
1066{
1067 if (expect_true (prev != next))
1068 {
1069 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1070 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
1071
1072 if (expect_false (next->flags & CF_RUNNING))
1073 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1074
1075 if (expect_false (next->flags & CF_DESTROYED))
1076 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1077
1078 if (
1079#if PERL_VERSION_ATLEAST (5,9,0)
1080 expect_false (PL_parser)
630#else 1081#else
631 1082 expect_false (PL_lex_state != LEX_NOTPARSING)
632 stack->ssize = STACKSIZE * (long)sizeof (long);
633 New (0, stack->sptr, STACKSIZE, long);
634
635 if (!stack->sptr)
636 {
637 perror (stderr, "FATAL: unable to malloc stack for coroutine");
638 _exit (EXIT_FAILURE);
639 }
640
641#endif 1083#endif
642 1084 )
643 coro_create (&stack->cctx, coro_run, (void *)stack, stack->sptr, stack->ssize); 1085 croak ("Coro::State::transfer called while parsing, but this is not supported");
644
645 return stack;
646}
647
648static void
649stack_free (coro_stack *stack)
650{
651 if (!stack)
652 return;
653
654#if HAVE_MMAP
655 munmap (stack->sptr, stack->ssize);
656#else
657 Safefree (stack->sptr);
658#endif
659
660 Safefree (stack);
661}
662
663static coro_stack *stack_first;
664
665static coro_stack *
666stack_get ()
667{
668 coro_stack *stack;
669
670 if (stack_first)
671 {
672 stack = stack_first;
673 stack_first = stack->next;
674 }
675 else
676 {
677 stack = stack_new ();
678 PL_op = PL_op->op_next;
679 } 1086 }
680
681 return stack;
682} 1087}
683 1088
684static void 1089/* always use the TRANSFER macro */
685stack_put (coro_stack *stack) 1090static void NOINLINE
686{
687 stack->next = stack_first;
688 stack_first = stack;
689}
690
691/* never call directly, always through the coro_state_transfer global variable */
692static void
693transfer_impl (pTHX_ struct coro *prev, struct coro *next, int flags) 1091transfer (pTHX_ struct coro *prev, struct coro *next)
694{ 1092{
695 dSTACKLEVEL; 1093 dSTACKLEVEL;
696 1094
697 /* sometimes transfer is only called to set idle_sp */ 1095 /* sometimes transfer is only called to set idle_sp */
698 if (flags == TRANSFER_SET_STACKLEVEL) 1096 if (expect_false (!next))
1097 {
699 ((coro_stack *)prev)->idle_sp = STACKLEVEL; 1098 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
700 else if (prev != next) 1099 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
701 { 1100 }
1101 else if (expect_true (prev != next))
1102 {
702 coro_stack *prev__stack; 1103 coro_cctx *prev__cctx;
1104
1105 if (expect_false (prev->flags & CF_NEW))
1106 {
1107 /* create a new empty context */
1108 Newz (0, prev->cctx, 1, coro_cctx);
1109 prev->flags &= ~CF_NEW;
1110 prev->flags |= CF_RUNNING;
1111 }
1112
1113 prev->flags &= ~CF_RUNNING;
1114 next->flags |= CF_RUNNING;
703 1115
704 LOCK; 1116 LOCK;
705 1117
706 if (next->mainstack) 1118 if (expect_false (next->flags & CF_NEW))
707 { 1119 {
708 /* coroutine already started */ 1120 /* need to start coroutine */
709 SAVE (prev, flags); 1121 next->flags &= ~CF_NEW;
710 LOAD (next); 1122 /* first get rid of the old state */
1123 save_perl (aTHX_ prev);
1124 /* setup coroutine call */
1125 coro_setup (aTHX_ next);
711 } 1126 }
712 else 1127 else
713 { 1128 {
714 /* need to start coroutine */ 1129 /* coroutine already started */
715 /* first get rid of the old state */ 1130 save_perl (aTHX_ prev);
716 SAVE (prev, -1); 1131 load_perl (aTHX_ next);
717 /* setup coroutine call */
718 setup_coro (next);
719 /* need a stack */
720 next->stack = 0;
721 } 1132 }
722 1133
723 if (!prev->stack)
724 /* create a new empty context */
725 Newz (0, prev->stack, 1, coro_stack);
726
727 prev__stack = prev->stack; 1134 prev__cctx = prev->cctx;
728 1135
729 /* possibly "free" the stack */ 1136 /* possibly "free" the cctx */
730 if (prev__stack->idle_sp == STACKLEVEL) 1137 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
731 { 1138 {
732 stack_put (prev__stack); 1139 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1140 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1141
733 prev->stack = 0; 1142 prev->cctx = 0;
1143
1144 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1145 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1146 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1147 if (!next->cctx)
1148 next->cctx = cctx_get (aTHX);
1149
1150 cctx_put (prev__cctx);
734 } 1151 }
735 1152
736 if (!next->stack) 1153 ++next->usecount;
737 next->stack = stack_get ();
738 1154
739 if (prev__stack != next->stack) 1155 if (expect_true (!next->cctx))
1156 next->cctx = cctx_get (aTHX);
1157
1158 if (expect_false (prev__cctx != next->cctx))
740 { 1159 {
741 prev__stack->top_env = PL_top_env; 1160 prev__cctx->top_env = PL_top_env;
742 PL_top_env = next->stack->top_env; 1161 PL_top_env = next->cctx->top_env;
743 coro_transfer (&prev__stack->cctx, &next->stack->cctx); 1162 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
744 } 1163 }
745 1164
746 free_coro_mortal (); 1165 free_coro_mortal (aTHX);
747
748 UNLOCK; 1166 UNLOCK;
749 }
750}
751 1167
752/* use this function pointer to call the above function */ 1168 if (expect_false (prev->throw || next->throw))
753/* this is done to increase chances of the compiler not inlining the call */ 1169 {
754/* not static to make it even harder for the compiler (and theoretically impossible in most cases */ 1170 struct coro *coro = SvSTATE (coro_current);
755void (*coro_state_transfer)(pTHX_ struct coro *prev, struct coro *next, int flags) = transfer_impl; 1171
1172 if (coro->throw)
1173 {
1174 SV *exception = coro->throw;
1175 coro->throw = 0;
1176 sv_setsv (ERRSV, exception);
1177 croak (0);
1178 }
1179 }
1180 }
1181}
756 1182
757struct transfer_args 1183struct transfer_args
758{ 1184{
759 struct coro *prev, *next; 1185 struct coro *prev, *next;
760 int flags;
761}; 1186};
762 1187
763#define TRANSFER(ta) coro_state_transfer ((ta).prev, (ta).next, (ta).flags) 1188#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
1189#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
764 1190
1191/** high level stuff ********************************************************/
1192
765static void 1193static int
766coro_state_destroy (struct coro *coro) 1194coro_state_destroy (pTHX_ struct coro *coro)
767{ 1195{
768 if (coro->refcnt--) 1196 if (coro->flags & CF_DESTROYED)
769 return; 1197 return 0;
1198
1199 coro->flags |= CF_DESTROYED;
1200
1201 if (coro->flags & CF_READY)
1202 {
1203 /* reduce nready, as destroying a ready coro effectively unreadies it */
1204 /* alternative: look through all ready queues and remove the coro */
1205 LOCK;
1206 --coro_nready;
1207 UNLOCK;
1208 }
1209 else
1210 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
770 1211
771 if (coro->mainstack && coro->mainstack != main_mainstack) 1212 if (coro->mainstack && coro->mainstack != main_mainstack)
772 { 1213 {
773 struct coro temp; 1214 struct coro temp;
774 1215
775 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL); 1216 if (coro->flags & CF_RUNNING)
1217 croak ("FATAL: tried to destroy currently running coroutine");
1218
1219 save_perl (aTHX_ &temp);
776 LOAD (aTHX_ coro); 1220 load_perl (aTHX_ coro);
777 1221
778 destroy_stacks (aTHX); 1222 coro_destroy (aTHX_ coro);
779 1223
780 LOAD ((&temp)); /* this will get rid of defsv etc.. */ 1224 load_perl (aTHX_ &temp);
781 1225
782 coro->mainstack = 0; 1226 coro->slot = 0;
783 } 1227 }
784 1228
785 stack_free (coro->stack); 1229 cctx_destroy (coro->cctx);
786 SvREFCNT_dec (coro->args); 1230 SvREFCNT_dec (coro->args);
787 Safefree (coro); 1231
1232 if (coro->next) coro->next->prev = coro->prev;
1233 if (coro->prev) coro->prev->next = coro->next;
1234 if (coro == coro_first) coro_first = coro->next;
1235
1236 return 1;
788} 1237}
789 1238
790static int 1239static int
791coro_state_clear (SV *sv, MAGIC *mg) 1240coro_state_free (pTHX_ SV *sv, MAGIC *mg)
792{ 1241{
793 struct coro *coro = (struct coro *)mg->mg_ptr; 1242 struct coro *coro = (struct coro *)mg->mg_ptr;
794 mg->mg_ptr = 0; 1243 mg->mg_ptr = 0;
795 1244
1245 coro->hv = 0;
1246
1247 if (--coro->refcnt < 0)
1248 {
796 coro_state_destroy (coro); 1249 coro_state_destroy (aTHX_ coro);
1250 Safefree (coro);
1251 }
797 1252
798 return 0; 1253 return 0;
799} 1254}
800 1255
801static int 1256static int
802coro_state_dup (MAGIC *mg, CLONE_PARAMS *params) 1257coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
803{ 1258{
804 struct coro *coro = (struct coro *)mg->mg_ptr; 1259 struct coro *coro = (struct coro *)mg->mg_ptr;
805 1260
806 ++coro->refcnt; 1261 ++coro->refcnt;
807 1262
808 return 0; 1263 return 0;
809} 1264}
810 1265
811static MGVTBL coro_state_vtbl = { 0, 0, 0, 0, coro_state_clear, 0, coro_state_dup, 0 }; 1266static MGVTBL coro_state_vtbl = {
1267 0, 0, 0, 0,
1268 coro_state_free,
1269 0,
1270#ifdef MGf_DUP
1271 coro_state_dup,
1272#else
1273# define MGf_DUP 0
1274#endif
1275};
812 1276
813static struct coro *
814SvSTATE (SV *coro)
815{
816 HV *stash;
817 MAGIC *mg;
818
819 if (SvROK (coro))
820 coro = SvRV (coro);
821
822 stash = SvSTASH (coro);
823 if (stash != coro_stash && stash != coro_state_stash)
824 {
825 /* very slow, but rare, check */
826 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
827 croak ("Coro::State object required");
828 }
829
830 mg = SvMAGIC (coro);
831 assert (mg->mg_type == PERL_MAGIC_ext);
832 return (struct coro *)mg->mg_ptr;
833}
834
835static void 1277static void
836prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev, SV *next, int flags) 1278prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
837{ 1279{
838 ta->prev = SvSTATE (prev); 1280 ta->prev = SvSTATE (prev_sv);
839 ta->next = SvSTATE (next); 1281 ta->next = SvSTATE (next_sv);
840 ta->flags = flags; 1282 TRANSFER_CHECK (*ta);
841} 1283}
842 1284
843static void 1285static void
844api_transfer (SV *prev, SV *next, int flags) 1286api_transfer (SV *prev_sv, SV *next_sv)
845{ 1287{
846 dTHX; 1288 dTHX;
847 struct transfer_args ta; 1289 struct transfer_args ta;
848 1290
849 prepare_transfer (aTHX_ &ta, prev, next, flags); 1291 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
850 TRANSFER (ta); 1292 TRANSFER (ta);
851} 1293}
852 1294
853/** Coro ********************************************************************/ 1295/** Coro ********************************************************************/
854 1296
855#define PRIO_MAX 3
856#define PRIO_HIGH 1
857#define PRIO_NORMAL 0
858#define PRIO_LOW -1
859#define PRIO_IDLE -3
860#define PRIO_MIN -4
861
862/* for Coro.pm */
863static GV *coro_current, *coro_idle;
864static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
865static int coro_nready;
866
867static void 1297static void
868coro_enq (pTHX_ SV *sv) 1298coro_enq (pTHX_ SV *coro_sv)
869{ 1299{
870 int prio;
871
872 if (SvTYPE (sv) != SVt_PVHV)
873 croak ("Coro::ready tried to enqueue something that is not a coroutine");
874
875 prio = SvSTATE (sv)->prio;
876
877 av_push (coro_ready [prio - PRIO_MIN], sv); 1300 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
878 coro_nready++;
879} 1301}
880 1302
881static SV * 1303static SV *
882coro_deq (pTHX_ int min_prio) 1304coro_deq (pTHX_ int min_prio)
883{ 1305{
887 if (min_prio < 0) 1309 if (min_prio < 0)
888 min_prio = 0; 1310 min_prio = 0;
889 1311
890 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1312 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )
891 if (AvFILLp (coro_ready [prio]) >= 0) 1313 if (AvFILLp (coro_ready [prio]) >= 0)
892 {
893 coro_nready--;
894 return av_shift (coro_ready [prio]); 1314 return av_shift (coro_ready [prio]);
895 }
896 1315
897 return 0; 1316 return 0;
898} 1317}
899 1318
900static void 1319static int
901api_ready (SV *coro) 1320api_ready (SV *coro_sv)
902{ 1321{
903 dTHX; 1322 dTHX;
1323 struct coro *coro;
904 1324
905 if (SvROK (coro)) 1325 if (SvROK (coro_sv))
906 coro = SvRV (coro); 1326 coro_sv = SvRV (coro_sv);
1327
1328 coro = SvSTATE (coro_sv);
1329
1330 if (coro->flags & CF_READY)
1331 return 0;
1332
1333 coro->flags |= CF_READY;
907 1334
908 LOCK; 1335 LOCK;
909 coro_enq (aTHX_ SvREFCNT_inc (coro)); 1336 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1337 ++coro_nready;
910 UNLOCK; 1338 UNLOCK;
911}
912 1339
1340 return 1;
1341}
1342
913static void 1343static int
1344api_is_ready (SV *coro_sv)
1345{
1346 dTHX;
1347 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1348}
1349
1350static void
914prepare_schedule (aTHX_ struct transfer_args *ta) 1351prepare_schedule (pTHX_ struct transfer_args *ta)
915{ 1352{
916 SV *current, *prev, *next; 1353 SV *prev_sv, *next_sv;
1354
1355 for (;;)
1356 {
1357 LOCK;
1358 next_sv = coro_deq (aTHX_ PRIO_MIN);
1359
1360 /* nothing to schedule: call the idle handler */
1361 if (expect_false (!next_sv))
1362 {
1363 dSP;
1364 UNLOCK;
1365
1366 ENTER;
1367 SAVETMPS;
1368
1369 PUSHMARK (SP);
1370 PUTBACK;
1371 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1372
1373 FREETMPS;
1374 LEAVE;
1375 continue;
1376 }
1377
1378 ta->next = SvSTATE (next_sv);
1379
1380 /* cannot transfer to destroyed coros, skip and look for next */
1381 if (expect_false (ta->next->flags & CF_DESTROYED))
1382 {
1383 UNLOCK;
1384 SvREFCNT_dec (next_sv);
1385 /* coro_nready is already taken care of by destroy */
1386 continue;
1387 }
1388
1389 --coro_nready;
1390 UNLOCK;
1391 break;
1392 }
1393
1394 /* free this only after the transfer */
1395 prev_sv = SvRV (coro_current);
1396 ta->prev = SvSTATE (prev_sv);
1397 TRANSFER_CHECK (*ta);
1398 assert (ta->next->flags & CF_READY);
1399 ta->next->flags &= ~CF_READY;
1400 SvRV_set (coro_current, next_sv);
917 1401
918 LOCK; 1402 LOCK;
919
920 current = GvSV (coro_current);
921
922 for (;;)
923 {
924 LOCK;
925
926 next = coro_deq (aTHX_ PRIO_MIN);
927
928 if (next)
929 break;
930
931 UNLOCK;
932
933 {
934 dSP;
935
936 ENTER;
937 SAVETMPS;
938
939 PUSHMARK (SP);
940 PUTBACK;
941 call_sv (GvSV (coro_idle), G_DISCARD);
942
943 FREETMPS;
944 LEAVE;
945 }
946 }
947
948 prev = SvRV (current);
949 SvRV (current) = next;
950
951 /* free this only after the transfer */
952 free_coro_mortal (); 1403 free_coro_mortal (aTHX);
953 coro_mortal = prev; 1404 coro_mortal = prev_sv;
954
955 ta->prev = SvSTATE (prev);
956 ta->next = SvSTATE (next);
957 ta->flags = TRANSFER_SAVE_ALL;
958
959 UNLOCK; 1405 UNLOCK;
960} 1406}
961 1407
962static void 1408static void
963prepare_cede (aTHX_ struct transfer_args *ta) 1409prepare_cede (pTHX_ struct transfer_args *ta)
964{ 1410{
965 LOCK; 1411 api_ready (coro_current);
966 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
967 UNLOCK;
968
969 prepare_schedule (ta); 1412 prepare_schedule (aTHX_ ta);
1413}
1414
1415static int
1416prepare_cede_notself (pTHX_ struct transfer_args *ta)
1417{
1418 if (coro_nready)
1419 {
1420 SV *prev = SvRV (coro_current);
1421 prepare_schedule (aTHX_ ta);
1422 api_ready (prev);
1423 return 1;
1424 }
1425 else
1426 return 0;
970} 1427}
971 1428
972static void 1429static void
973api_schedule (void) 1430api_schedule (void)
974{ 1431{
975 dTHX; 1432 dTHX;
976 struct transfer_args ta; 1433 struct transfer_args ta;
977 1434
978 prepare_schedule (&ta); 1435 prepare_schedule (aTHX_ &ta);
979 TRANSFER (ta); 1436 TRANSFER (ta);
980} 1437}
981 1438
982static void 1439static int
983api_cede (void) 1440api_cede (void)
984{ 1441{
985 dTHX; 1442 dTHX;
986 struct transfer_args ta; 1443 struct transfer_args ta;
987 1444
988 prepare_cede (&ta); 1445 prepare_cede (aTHX_ &ta);
1446
1447 if (expect_true (ta.prev != ta.next))
1448 {
989 TRANSFER (ta); 1449 TRANSFER (ta);
1450 return 1;
1451 }
1452 else
1453 return 0;
990} 1454}
991 1455
1456static int
1457api_cede_notself (void)
1458{
1459 dTHX;
1460 struct transfer_args ta;
1461
1462 if (prepare_cede_notself (aTHX_ &ta))
1463 {
1464 TRANSFER (ta);
1465 return 1;
1466 }
1467 else
1468 return 0;
1469}
1470
1471static void
1472api_trace (SV *coro_sv, int flags)
1473{
1474 dTHX;
1475 struct coro *coro = SvSTATE (coro_sv);
1476
1477 if (flags & CC_TRACE)
1478 {
1479 if (!coro->cctx)
1480 coro->cctx = cctx_new ();
1481 else if (!(coro->cctx->flags & CC_TRACE))
1482 croak ("cannot enable tracing on coroutine with custom stack");
1483
1484 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1485 }
1486 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1487 {
1488 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1489
1490 if (coro->flags & CF_RUNNING)
1491 PL_runops = RUNOPS_DEFAULT;
1492 else
1493 coro->slot->runops = RUNOPS_DEFAULT;
1494 }
1495}
1496
992MODULE = Coro::State PACKAGE = Coro::State 1497MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
993 1498
994PROTOTYPES: DISABLE 1499PROTOTYPES: DISABLE
995 1500
996BOOT: 1501BOOT:
997{ 1502{
998#ifdef USE_ITHREADS 1503#ifdef USE_ITHREADS
999 MUTEX_INIT (&coro_mutex); 1504 MUTEX_INIT (&coro_mutex);
1000#endif 1505#endif
1001 BOOT_PAGESIZE; 1506 BOOT_PAGESIZE;
1002 1507
1508 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1509 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1510
1511 hv_sig = coro_get_hv ("SIG", TRUE);
1512 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE);
1513 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE);
1514
1515 if (!PL_diehook ) hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);
1516 if (!PL_warnhook) hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);
1517
1003 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1518 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1004 1519
1005 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 1520 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1006 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 1521 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1007 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 1522 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1523 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1008 1524
1009 main_mainstack = PL_mainstack; 1525 main_mainstack = PL_mainstack;
1526 main_top_env = PL_top_env;
1527
1528 while (main_top_env->je_prev)
1529 main_top_env = main_top_env->je_prev;
1010 1530
1011 coroapi.ver = CORO_API_VERSION; 1531 coroapi.ver = CORO_API_VERSION;
1532 coroapi.rev = CORO_API_REVISION;
1012 coroapi.transfer = api_transfer; 1533 coroapi.transfer = api_transfer;
1013 1534
1014 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1535 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1015} 1536}
1016 1537
1021 struct coro *coro; 1542 struct coro *coro;
1022 HV *hv; 1543 HV *hv;
1023 int i; 1544 int i;
1024 1545
1025 Newz (0, coro, 1, struct coro); 1546 Newz (0, coro, 1, struct coro);
1026 coro->args = newAV (); 1547 coro->args = newAV ();
1548 coro->flags = CF_NEW;
1027 1549
1550 if (coro_first) coro_first->prev = coro;
1551 coro->next = coro_first;
1552 coro_first = coro;
1553
1028 hv = newHV (); 1554 coro->hv = hv = newHV ();
1029 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1555 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1030 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1556 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1031 1557
1558 av_extend (coro->args, items - 1);
1032 for (i = 1; i < items; i++) 1559 for (i = 1; i < items; i++)
1033 av_push (coro->args, newSVsv (ST (i))); 1560 av_push (coro->args, newSVsv (ST (i)));
1034
1035 /*coro->mainstack = 0; *//*actual work is done inside transfer */
1036 /*coro->stack = 0;*/
1037} 1561}
1038 OUTPUT: 1562 OUTPUT:
1039 RETVAL 1563 RETVAL
1040 1564
1565# these not obviously related functions are all rolled into the same xs
1566# function to increase chances that they all will call transfer with the same
1567# stack offset
1041void 1568void
1042_set_stacklevel (...) 1569_set_stacklevel (...)
1043 ALIAS: 1570 ALIAS:
1044 Coro::State::transfer = 1 1571 Coro::State::transfer = 1
1045 Coro::schedule = 2 1572 Coro::schedule = 2
1046 Coro::cede = 3 1573 Coro::cede = 3
1047 Coro::Cont::yield = 4 1574 Coro::cede_notself = 4
1048 CODE: 1575 CODE:
1049{ 1576{
1050 struct transfer_args ta; 1577 struct transfer_args ta;
1051 1578
1052 switch (ix) 1579 switch (ix)
1053 { 1580 {
1054 case 0: 1581 case 0:
1055 ta.prev = (struct coro *)INT2PTR (coro_stack *, SvIV (ST (0))); 1582 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1056 ta.next = 0; 1583 ta.next = 0;
1057 ta.flags = TRANSFER_SET_STACKLEVEL;
1058 break; 1584 break;
1059 1585
1060 case 1: 1586 case 1:
1061 if (items != 3) 1587 if (items != 2)
1062 croak ("Coro::State::transfer(prev,next,flags) expects three arguments, not %d", items); 1588 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1063 1589
1064 prepare_transfer (&ta, ST (0), ST (1), SvIV (ST (2))); 1590 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1065 break; 1591 break;
1066 1592
1067 case 2: 1593 case 2:
1068 prepare_schedule (&ta); 1594 prepare_schedule (aTHX_ &ta);
1069 break; 1595 break;
1070 1596
1071 case 3: 1597 case 3:
1072 prepare_cede (&ta); 1598 prepare_cede (aTHX_ &ta);
1073 break; 1599 break;
1074 1600
1075 case 4: 1601 case 4:
1076 { 1602 if (!prepare_cede_notself (aTHX_ &ta))
1077 SV *yieldstack; 1603 XSRETURN_EMPTY;
1078 SV *sv;
1079 AV *defav = GvAV (PL_defgv);
1080 1604
1081 yieldstack = *hv_fetch (
1082 (HV *)SvRV (GvSV (coro_current)),
1083 "yieldstack", sizeof ("yieldstack") - 1,
1084 0
1085 );
1086
1087 /* set up @_ -- ugly */
1088 av_clear (defav);
1089 av_fill (defav, items - 1);
1090 while (items--)
1091 av_store (defav, items, SvREFCNT_inc (ST(items)));
1092
1093 sv = av_pop ((AV *)SvRV (yieldstack));
1094 ta.prev = SvSTATE (*av_fetch ((AV *)SvRV (sv), 0, 0));
1095 ta.next = SvSTATE (*av_fetch ((AV *)SvRV (sv), 1, 0));
1096 ta.flags = 0;
1097 SvREFCNT_dec (sv);
1098 }
1099 break; 1605 break;
1100
1101 } 1606 }
1102 1607
1608 BARRIER;
1609 PUTBACK;
1103 TRANSFER (ta); 1610 TRANSFER (ta);
1611 SPAGAIN; /* might be the sp of a different coroutine now */
1612 /* be extra careful not to ever do anything after TRANSFER */
1104} 1613}
1105 1614
1106void 1615bool
1107_clone_state_from (SV *dst, SV *src) 1616_destroy (SV *coro_sv)
1108 CODE: 1617 CODE:
1109{ 1618 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1110 struct coro *coro_src = SvSTATE (src); 1619 OUTPUT:
1111 1620 RETVAL
1112 sv_unmagic (SvRV (dst), PERL_MAGIC_ext);
1113
1114 ++coro_src->refcnt;
1115 sv_magicext (SvRV (dst), 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro_src, 0)->mg_flags |= MGf_DUP;
1116}
1117
1118void
1119_nonlocal_goto (IV nextop)
1120 CODE:
1121 /* uuh, somebody will kill me again for this */
1122 PL_op->op_next = INT2PTR (OP *, nextop);
1123 1621
1124void 1622void
1125_exit (code) 1623_exit (code)
1126 int code 1624 int code
1127 PROTOTYPE: $ 1625 PROTOTYPE: $
1128 CODE: 1626 CODE:
1129 _exit (code); 1627 _exit (code);
1130 1628
1629int
1630cctx_stacksize (int new_stacksize = 0)
1631 CODE:
1632 RETVAL = coro_stacksize;
1633 if (new_stacksize)
1634 coro_stacksize = new_stacksize;
1635 OUTPUT:
1636 RETVAL
1637
1638int
1639cctx_count ()
1640 CODE:
1641 RETVAL = cctx_count;
1642 OUTPUT:
1643 RETVAL
1644
1645int
1646cctx_idle ()
1647 CODE:
1648 RETVAL = cctx_idle;
1649 OUTPUT:
1650 RETVAL
1651
1652void
1653list ()
1654 PPCODE:
1655{
1656 struct coro *coro;
1657 for (coro = coro_first; coro; coro = coro->next)
1658 if (coro->hv)
1659 XPUSHs (sv_2mortal (newRV_inc ((SV *)coro->hv)));
1660}
1661
1662void
1663call (Coro::State coro, SV *coderef)
1664 ALIAS:
1665 eval = 1
1666 CODE:
1667{
1668 if (coro->mainstack)
1669 {
1670 struct coro temp;
1671
1672 if (!(coro->flags & CF_RUNNING))
1673 {
1674 save_perl (aTHX_ &temp);
1675 load_perl (aTHX_ coro);
1676 }
1677
1678 {
1679 dSP;
1680 ENTER;
1681 SAVETMPS;
1682 PUTBACK;
1683 PUSHSTACK;
1684 PUSHMARK (SP);
1685
1686 if (ix)
1687 eval_sv (coderef, 0);
1688 else
1689 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1690
1691 POPSTACK;
1692 SPAGAIN;
1693 FREETMPS;
1694 LEAVE;
1695 PUTBACK;
1696 }
1697
1698 if (!(coro->flags & CF_RUNNING))
1699 {
1700 save_perl (aTHX_ coro);
1701 load_perl (aTHX_ &temp);
1702 }
1703 }
1704}
1705
1706SV *
1707is_ready (Coro::State coro)
1708 PROTOTYPE: $
1709 ALIAS:
1710 is_ready = CF_READY
1711 is_running = CF_RUNNING
1712 is_new = CF_NEW
1713 is_destroyed = CF_DESTROYED
1714 CODE:
1715 RETVAL = boolSV (coro->flags & ix);
1716 OUTPUT:
1717 RETVAL
1718
1719void
1720api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1721
1722SV *
1723has_stack (Coro::State coro)
1724 PROTOTYPE: $
1725 CODE:
1726 RETVAL = boolSV (!!coro->cctx);
1727 OUTPUT:
1728 RETVAL
1729
1730int
1731is_traced (Coro::State coro)
1732 PROTOTYPE: $
1733 CODE:
1734 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1735 OUTPUT:
1736 RETVAL
1737
1738IV
1739rss (Coro::State coro)
1740 PROTOTYPE: $
1741 ALIAS:
1742 usecount = 1
1743 CODE:
1744 switch (ix)
1745 {
1746 case 0: RETVAL = coro_rss (aTHX_ coro); break;
1747 case 1: RETVAL = coro->usecount; break;
1748 }
1749 OUTPUT:
1750 RETVAL
1751
1752
1131MODULE = Coro::State PACKAGE = Coro 1753MODULE = Coro::State PACKAGE = Coro
1132 1754
1133BOOT: 1755BOOT:
1134{ 1756{
1135 int i; 1757 int i;
1136 1758
1759 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1760 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1761 av_async_pool = coro_get_av ("Coro::async_pool", TRUE);
1762
1763 coro_current = coro_get_sv ("Coro::current", FALSE);
1764 SvREADONLY_on (coro_current);
1765
1137 coro_stash = gv_stashpv ("Coro", TRUE); 1766 coro_stash = gv_stashpv ("Coro", TRUE);
1138 1767
1139 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 1768 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1140 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 1769 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1141 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 1770 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1142 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 1771 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1143 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 1772 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
1144 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 1773 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
1145 1774
1146 coro_current = gv_fetchpv ("Coro::current", TRUE, SVt_PV);
1147 coro_idle = gv_fetchpv ("Coro::idle" , TRUE, SVt_PV);
1148
1149 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 1775 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1150 coro_ready[i] = newAV (); 1776 coro_ready[i] = newAV ();
1151 1777
1152 { 1778 {
1153 SV *sv = perl_get_sv("Coro::API", 1); 1779 SV *sv = perl_get_sv ("Coro::API", TRUE);
1780 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1154 1781
1155 coroapi.schedule = api_schedule; 1782 coroapi.schedule = api_schedule;
1156 coroapi.cede = api_cede; 1783 coroapi.cede = api_cede;
1784 coroapi.cede_notself = api_cede_notself;
1157 coroapi.ready = api_ready; 1785 coroapi.ready = api_ready;
1786 coroapi.is_ready = api_is_ready;
1158 coroapi.nready = &coro_nready; 1787 coroapi.nready = &coro_nready;
1159 coroapi.current = coro_current; 1788 coroapi.current = coro_current;
1160 1789
1161 GCoroAPI = &coroapi; 1790 GCoroAPI = &coroapi;
1162 sv_setiv (sv, (IV)&coroapi); 1791 sv_setiv (sv, (IV)&coroapi);
1163 SvREADONLY_on (sv); 1792 SvREADONLY_on (sv);
1164 } 1793 }
1165} 1794}
1795
1796void
1797_set_current (SV *current)
1798 PROTOTYPE: $
1799 CODE:
1800 SvREFCNT_dec (SvRV (coro_current));
1801 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current)));
1166 1802
1167int 1803int
1168prio (Coro::State coro, int newprio = 0) 1804prio (Coro::State coro, int newprio = 0)
1169 ALIAS: 1805 ALIAS:
1170 nice = 1 1806 nice = 1
1173 RETVAL = coro->prio; 1809 RETVAL = coro->prio;
1174 1810
1175 if (items > 1) 1811 if (items > 1)
1176 { 1812 {
1177 if (ix) 1813 if (ix)
1178 newprio += coro->prio; 1814 newprio = coro->prio - newprio;
1179 1815
1180 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 1816 if (newprio < PRIO_MIN) newprio = PRIO_MIN;
1181 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 1817 if (newprio > PRIO_MAX) newprio = PRIO_MAX;
1182 1818
1183 coro->prio = newprio; 1819 coro->prio = newprio;
1184 } 1820 }
1185} 1821}
1822 OUTPUT:
1823 RETVAL
1186 1824
1187void 1825SV *
1188ready (SV *self) 1826ready (SV *self)
1189 PROTOTYPE: $ 1827 PROTOTYPE: $
1190 CODE: 1828 CODE:
1191 api_ready (self); 1829 RETVAL = boolSV (api_ready (self));
1830 OUTPUT:
1831 RETVAL
1192 1832
1193int 1833int
1194nready (...) 1834nready (...)
1195 PROTOTYPE: 1835 PROTOTYPE:
1196 CODE: 1836 CODE:
1197 RETVAL = coro_nready; 1837 RETVAL = coro_nready;
1198 OUTPUT: 1838 OUTPUT:
1199 RETVAL 1839 RETVAL
1200 1840
1841void
1842throw (Coro::State self, SV *throw = &PL_sv_undef)
1843 PROTOTYPE: $;$
1844 CODE:
1845 SvREFCNT_dec (self->throw);
1846 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1847
1848# for async_pool speedup
1849void
1850_pool_1 (SV *cb)
1851 CODE:
1852{
1853 struct coro *coro = SvSTATE (coro_current);
1854 HV *hv = (HV *)SvRV (coro_current);
1855 AV *defav = GvAV (PL_defgv);
1856 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1857 AV *invoke_av;
1858 int i, len;
1859
1860 if (!invoke)
1861 croak ("\3async_pool terminate\2\n");
1862
1863 SvREFCNT_dec (coro->saved_deffh);
1864 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv);
1865
1866 hv_store (hv, "desc", sizeof ("desc") - 1,
1867 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1868
1869 invoke_av = (AV *)SvRV (invoke);
1870 len = av_len (invoke_av);
1871
1872 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1873
1874 if (len > 0)
1875 {
1876 av_fill (defav, len - 1);
1877 for (i = 0; i < len; ++i)
1878 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1]));
1879 }
1880
1881 SvREFCNT_dec (invoke);
1882}
1883
1884void
1885_pool_2 (SV *cb)
1886 CODE:
1887{
1888 struct coro *coro = SvSTATE (coro_current);
1889
1890 sv_setsv (cb, &PL_sv_undef);
1891
1892 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1893 coro->saved_deffh = 0;
1894
1895 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1896 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
1897 croak ("\3async_pool terminate\2\n");
1898
1899 av_clear (GvAV (PL_defgv));
1900 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1901 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1902
1903 coro->prio = 0;
1904
1905 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1906 api_trace (coro_current, 0);
1907
1908 av_push (av_async_pool, newSVsv (coro_current));
1909}
1910
1911
1201MODULE = Coro::State PACKAGE = Coro::AIO 1912MODULE = Coro::State PACKAGE = Coro::AIO
1202 1913
1203SV * 1914SV *
1204_get_state () 1915_get_state ()
1205 CODE: 1916 CODE:
1206{ 1917{
1207 struct { 1918 struct io_state *data;
1208 int errorno;
1209 int laststype;
1210 int laststatval;
1211 Stat_t statcache;
1212 } data;
1213 1919
1920 RETVAL = newSV (sizeof (struct io_state));
1921 data = (struct io_state *)SvPVX (RETVAL);
1922 SvCUR_set (RETVAL, sizeof (struct io_state));
1923 SvPOK_only (RETVAL);
1924
1214 data.errorno = errno; 1925 data->errorno = errno;
1215 data.laststype = PL_laststype; 1926 data->laststype = PL_laststype;
1216 data.laststatval = PL_laststatval; 1927 data->laststatval = PL_laststatval;
1217 data.statcache = PL_statcache; 1928 data->statcache = PL_statcache;
1218
1219 RETVAL = newSVpvn ((char *)&data, sizeof data);
1220} 1929}
1221 OUTPUT: 1930 OUTPUT:
1222 RETVAL 1931 RETVAL
1223 1932
1224void 1933void
1225_set_state (char *data_) 1934_set_state (char *data_)
1226 PROTOTYPE: $ 1935 PROTOTYPE: $
1227 CODE: 1936 CODE:
1228{ 1937{
1229 struct { 1938 struct io_state *data = (void *)data_;
1230 int errorno;
1231 int laststype;
1232 int laststatval;
1233 Stat_t statcache;
1234 } *data = (void *)data_;
1235 1939
1236 errno = data->errorno; 1940 errno = data->errorno;
1237 PL_laststype = data->laststype; 1941 PL_laststype = data->laststype;
1238 PL_laststatval = data->laststatval; 1942 PL_laststatval = data->laststatval;
1239 PL_statcache = data->statcache; 1943 PL_statcache = data->statcache;
1240} 1944}
1945

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines