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

Diff Legend

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