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.166 by root, Wed Sep 26 21:11:28 2007 UTC vs.
Revision 1.257 by root, Sun Nov 9 15:35:44 2008 UTC

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

Diff Legend

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