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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines