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

Diff Legend

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