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

Diff Legend

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