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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines