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.212 by root, Wed Oct 10 04:21:33 2007 UTC vs.
Revision 1.276 by root, Sat Nov 15 07:49:48 2008 UTC

… …
4#define PERL_EXT 4#define PERL_EXT
5 5
6#include "EXTERN.h" 6#include "EXTERN.h"
7#include "perl.h" 7#include "perl.h"
8#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h"
9 10
10#include "patchlevel.h" 11#include "patchlevel.h"
11 12
12#include <stdio.h> 13#include <stdio.h>
13#include <errno.h> 14#include <errno.h>
14#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
15#include <inttypes.h> /* portable stdint.h */ 23# include <inttypes.h> /* most portable stdint.h */
24#endif
16 25
17#ifdef HAVE_MMAP 26#ifdef HAVE_MMAP
18# include <unistd.h> 27# include <unistd.h>
19# include <sys/mman.h> 28# include <sys/mman.h>
20# ifndef MAP_ANONYMOUS 29# ifndef MAP_ANONYMOUS
… …
37# define BOOT_PAGESIZE (void)0 46# define BOOT_PAGESIZE (void)0
38#endif 47#endif
39 48
40#if CORO_USE_VALGRIND 49#if CORO_USE_VALGRIND
41# include <valgrind/valgrind.h> 50# include <valgrind/valgrind.h>
42# define REGISTER_STACK(cctx,start,end) (cctx)->valgrind_id = VALGRIND_STACK_REGISTER ((start), (end))
43#else
44# define REGISTER_STACK(cctx,start,end)
45#endif 51#endif
46 52
47/* the maximum number of idle cctx that will be pooled */ 53/* the maximum number of idle cctx that will be pooled */
48#define MAX_IDLE_CCTX 8 54static int cctx_max_idle = 4;
49 55
50#define PERL_VERSION_ATLEAST(a,b,c) \ 56#define PERL_VERSION_ATLEAST(a,b,c) \
51 (PERL_REVISION > (a) \ 57 (PERL_REVISION > (a) \
52 || (PERL_REVISION == (a) \ 58 || (PERL_REVISION == (a) \
53 && (PERL_VERSION > (b) \ 59 && (PERL_VERSION > (b) \
… …
72# ifndef IS_PADCONST 78# ifndef IS_PADCONST
73# define IS_PADCONST(v) 0 79# define IS_PADCONST(v) 0
74# endif 80# endif
75#endif 81#endif
76 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
77/* 5.8.7 */ 101/* 5.8.7 */
78#ifndef SvRV_set 102#ifndef SvRV_set
79# define SvRV_set(s,v) SvRV(s) = (v) 103# define SvRV_set(s,v) SvRV(s) = (v)
80#endif 104#endif
81 105
82/* 5.8.8 */
83#ifndef GV_NOTQUAL
84# define GV_NOTQUAL 0
85#endif
86#ifndef newSV
87# define newSV(l) NEWSV(0,l)
88#endif
89
90#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 106#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
91# undef CORO_STACKGUARD 107# undef CORO_STACKGUARD
92#endif 108#endif
93 109
94#ifndef CORO_STACKGUARD 110#ifndef CORO_STACKGUARD
… …
100# define CORO_PREFER_PERL_FUNCTIONS 0 116# define CORO_PREFER_PERL_FUNCTIONS 0
101#endif 117#endif
102 118
103/* 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
104 * portable way as possible. */ 120 * portable way as possible. */
105#define dSTACKLEVEL volatile char stacklevel 121#if __GNUC__ >= 4
106#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
107 126
108#define IN_DESTRUCT (PL_main_cv == Nullcv) 127#define IN_DESTRUCT (PL_main_cv == Nullcv)
109 128
110#if __GNUC__ >= 3 129#if __GNUC__ >= 3
111# define attribute(x) __attribute__(x) 130# define attribute(x) __attribute__(x)
112# define BARRIER __asm__ __volatile__ ("" : : : "memory")
113# define expect(expr,value) __builtin_expect ((expr),(value)) 131# define expect(expr,value) __builtin_expect ((expr),(value))
132# define INLINE static inline
114#else 133#else
115# define attribute(x) 134# define attribute(x)
116# define BARRIER
117# define expect(expr,value) (expr) 135# define expect(expr,value) (expr)
136# define INLINE static
118#endif 137#endif
119 138
120#define expect_false(expr) expect ((expr) != 0, 0) 139#define expect_false(expr) expect ((expr) != 0, 0)
121#define expect_true(expr) expect ((expr) != 0, 1) 140#define expect_true(expr) expect ((expr) != 0, 1)
122 141
123#define NOINLINE attribute ((noinline)) 142#define NOINLINE attribute ((noinline))
124 143
125#include "CoroAPI.h" 144#include "CoroAPI.h"
126 145
127#ifdef USE_ITHREADS 146#ifdef USE_ITHREADS
147
128static perl_mutex coro_mutex; 148static perl_mutex coro_lock;
129# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 149# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0)
130# 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
131#else 155#else
156
132# define LOCK (void)0 157# define LOCK (void)0
133# define UNLOCK (void)0 158# define UNLOCK (void)0
159
134#endif 160#endif
161
162# undef LOCK
163# define LOCK (void)0
164# undef UNLOCK
165# define UNLOCK (void)0
135 166
136/* helper storage struct for Coro::AIO */ 167/* helper storage struct for Coro::AIO */
137struct io_state 168struct io_state
138{ 169{
170 AV *res;
139 int errorno; 171 int errorno;
140 I32 laststype; 172 I32 laststype; /* U16 in 5.10.0 */
141 int laststatval; 173 int laststatval;
142 Stat_t statcache; 174 Stat_t statcache;
143}; 175};
144 176
177static double (*nvtime)(); /* so why doesn't it take void? */
178
179static U32 cctx_gen;
145static size_t coro_stacksize = CORO_STACKSIZE; 180static size_t cctx_stacksize = CORO_STACKSIZE;
146static struct CoroAPI coroapi; 181static struct CoroAPI coroapi;
147static AV *main_mainstack; /* used to differentiate between $main and others */ 182static AV *main_mainstack; /* used to differentiate between $main and others */
148static JMPENV *main_top_env; 183static JMPENV *main_top_env;
149static HV *coro_state_stash, *coro_stash; 184static HV *coro_state_stash, *coro_stash;
150static 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;
151 187
152static GV *irsgv; /* $/ */ 188static GV *irsgv; /* $/ */
153static GV *stdoutgv; /* *STDOUT */ 189static GV *stdoutgv; /* *STDOUT */
154 190static SV *rv_diehook;
191static SV *rv_warnhook;
155static HV *hv_sig; /* %SIG */ 192static HV *hv_sig; /* %SIG */
156static SV *sv_diehook;
157static SV *sv_warnhook;
158 193
159/* async_pool helper stuff */ 194/* async_pool helper stuff */
160static SV *sv_pool_rss; 195static SV *sv_pool_rss;
161static SV *sv_pool_size; 196static SV *sv_pool_size;
162static AV *av_async_pool; 197static AV *av_async_pool;
198
199/* Coro::AnyEvent */
200static SV *sv_activity;
163 201
164static struct coro_cctx *cctx_first; 202static struct coro_cctx *cctx_first;
165static int cctx_count, cctx_idle; 203static int cctx_count, cctx_idle;
166 204
167enum { 205enum {
… …
172 CC_TRACE_LINE = 0x10, /* trace each statement */ 210 CC_TRACE_LINE = 0x10, /* trace each statement */
173 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE, 211 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
174}; 212};
175 213
176/* this is a structure representing a c-level coroutine */ 214/* this is a structure representing a c-level coroutine */
177typedef struct coro_cctx { 215typedef struct coro_cctx
216{
178 struct coro_cctx *next; 217 struct coro_cctx *next;
179 218
180 /* the stack */ 219 /* the stack */
181 void *sptr; 220 void *sptr;
182 size_t ssize; 221 size_t ssize;
… …
185 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 224 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
186 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 */
187 JMPENV *top_env; 226 JMPENV *top_env;
188 coro_context cctx; 227 coro_context cctx;
189 228
229 U32 gen;
190#if CORO_USE_VALGRIND 230#if CORO_USE_VALGRIND
191 int valgrind_id; 231 int valgrind_id;
192#endif 232#endif
193 unsigned char flags; 233 unsigned char flags;
194} coro_cctx; 234} coro_cctx;
… …
199 CF_NEW = 0x0004, /* has never been switched to */ 239 CF_NEW = 0x0004, /* has never been switched to */
200 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 240 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
201}; 241};
202 242
203/* the structure where most of the perl state is stored, overlaid on the cxstack */ 243/* the structure where most of the perl state is stored, overlaid on the cxstack */
204typedef struct { 244typedef struct
245{
205 SV *defsv; 246 SV *defsv;
206 AV *defav; 247 AV *defav;
207 SV *errsv; 248 SV *errsv;
208 SV *irsgv; 249 SV *irsgv;
209#define VAR(name,type) type name; 250#define VAR(name,type) type name;
… …
213 254
214#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT)) 255#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
215 256
216/* this is a structure representing a perl-level coroutine */ 257/* this is a structure representing a perl-level coroutine */
217struct coro { 258struct coro {
218 /* the c coroutine allocated to this perl coroutine, if any */ 259 /* the C coroutine allocated to this perl coroutine, if any */
219 coro_cctx *cctx; 260 coro_cctx *cctx;
220 261
221 /* process data */ 262 /* process data */
263 struct CoroSLF slf_frame; /* saved slf frame */
222 AV *mainstack; 264 AV *mainstack;
223 perl_slots *slot; /* basically the saved sp */ 265 perl_slots *slot; /* basically the saved sp */
224 266
225 AV *args; /* data associated with this coroutine (initial args) */ 267 AV *args; /* data associated with this coroutine (initial args) */
226 int refcnt; /* coroutines are refcounted, yes */ 268 int refcnt; /* coroutines are refcounted, yes */
… …
241 struct coro *next, *prev; 283 struct coro *next, *prev;
242}; 284};
243 285
244typedef struct coro *Coro__State; 286typedef struct coro *Coro__State;
245typedef struct coro *Coro__State_or_hashref; 287typedef struct coro *Coro__State_or_hashref;
288
289static struct CoroSLF slf_frame; /* the current slf frame */
246 290
247/** Coro ********************************************************************/ 291/** Coro ********************************************************************/
248 292
249#define PRIO_MAX 3 293#define PRIO_MAX 3
250#define PRIO_HIGH 1 294#define PRIO_HIGH 1
… …
253#define PRIO_IDLE -3 297#define PRIO_IDLE -3
254#define PRIO_MIN -4 298#define PRIO_MIN -4
255 299
256/* for Coro.pm */ 300/* for Coro.pm */
257static SV *coro_current; 301static SV *coro_current;
302static SV *coro_readyhook;
258static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 303static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
259static int coro_nready;
260static struct coro *coro_first; 304static struct coro *coro_first;
305#define coro_nready coroapi.nready
261 306
262/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
263 308
264static SV * 309static SV *
265coro_get_sv (const char *name, int create) 310coro_get_sv (pTHX_ const char *name, int create)
266{ 311{
267#if PERL_VERSION_ATLEAST (5,9,0) 312#if PERL_VERSION_ATLEAST (5,10,0)
268 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 313 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
269 get_sv (name, create); 314 get_sv (name, create);
270#endif 315#endif
271 return get_sv (name, create); 316 return get_sv (name, create);
272} 317}
273 318
274static AV * 319static AV *
275coro_get_av (const char *name, int create) 320coro_get_av (pTHX_ const char *name, int create)
276{ 321{
277#if PERL_VERSION_ATLEAST (5,9,0) 322#if PERL_VERSION_ATLEAST (5,10,0)
278 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 323 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
279 get_av (name, create); 324 get_av (name, create);
280#endif 325#endif
281 return get_av (name, create); 326 return get_av (name, create);
282} 327}
283 328
284static HV * 329static HV *
285coro_get_hv (const char *name, int create) 330coro_get_hv (pTHX_ const char *name, int create)
286{ 331{
287#if PERL_VERSION_ATLEAST (5,9,0) 332#if PERL_VERSION_ATLEAST (5,10,0)
288 /* silence stupid and wrong 5.10 warning that I am unable to switch off */ 333 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
289 get_hv (name, create); 334 get_hv (name, create);
290#endif 335#endif
291 return get_hv (name, create); 336 return get_hv (name, create);
292} 337}
… …
297 AV *padlist = CvPADLIST (cv); 342 AV *padlist = CvPADLIST (cv);
298 AV *newpadlist, *newpad; 343 AV *newpadlist, *newpad;
299 344
300 newpadlist = newAV (); 345 newpadlist = newAV ();
301 AvREAL_off (newpadlist); 346 AvREAL_off (newpadlist);
302#if PERL_VERSION_ATLEAST (5,9,0) 347#if PERL_VERSION_ATLEAST (5,10,0)
303 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 348 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
304#else 349#else
305 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 350 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
306#endif 351#endif
307 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 352 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
308 --AvFILLp (padlist); 353 --AvFILLp (padlist);
309 354
310 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 355 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
311 av_store (newpadlist, 1, (SV *)newpad); 356 av_store (newpadlist, 1, (SV *)newpad);
312 357
313 return newpadlist; 358 return newpadlist;
314} 359}
315 360
… …
345 390
346 /* casting is fun. */ 391 /* casting is fun. */
347 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 392 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
348 free_padlist (aTHX_ padlist); 393 free_padlist (aTHX_ padlist);
349 394
350 SvREFCNT_dec (av); 395 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
351 396
352 return 0; 397 return 0;
353} 398}
354 399
355#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
356 402
357static 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};
358 407
359#define CORO_MAGIC(cv) \ 408#define CORO_MAGIC(sv, type) \
360 SvMAGIC (cv) \ 409 SvMAGIC (sv) \
361 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 410 ? SvMAGIC (sv)->mg_type == type \
362 ? SvMAGIC (cv) \ 411 ? SvMAGIC (sv) \
363 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 412 : mg_find (sv, type) \
364 : 0 413 : 0
365 414
366static 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 *
367SvSTATE_ (pTHX_ SV *coro) 419SvSTATE_ (pTHX_ SV *coro)
368{ 420{
369 HV *stash; 421 HV *stash;
370 MAGIC *mg; 422 MAGIC *mg;
371 423
… …
381 /* very slow, but rare, check */ 433 /* very slow, but rare, check */
382 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 434 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
383 croak ("Coro::State object required"); 435 croak ("Coro::State object required");
384 } 436 }
385 437
386 mg = CORO_MAGIC (coro); 438 mg = CORO_MAGIC_state (coro);
387 return (struct coro *)mg->mg_ptr; 439 return (struct coro *)mg->mg_ptr;
388} 440}
389 441
390#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 442#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
391 443
392/* the next two functions merely cache the padlists */ 444/* the next two functions merely cache the padlists */
393static void 445static void
394get_padlist (pTHX_ CV *cv) 446get_padlist (pTHX_ CV *cv)
395{ 447{
396 MAGIC *mg = CORO_MAGIC (cv); 448 MAGIC *mg = CORO_MAGIC_cv (cv);
397 AV *av; 449 AV *av;
398 450
399 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 451 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
400 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 452 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
401 else 453 else
402 { 454 {
403#if CORO_PREFER_PERL_FUNCTIONS 455#if CORO_PREFER_PERL_FUNCTIONS
404 /* this is probably cleaner, but also slower? */ 456 /* this is probably cleaner? but also slower! */
457 /* in practise, it seems to be less stable */
405 CV *cp = Perl_cv_clone (cv); 458 CV *cp = Perl_cv_clone (cv);
406 CvPADLIST (cv) = CvPADLIST (cp); 459 CvPADLIST (cv) = CvPADLIST (cp);
407 CvPADLIST (cp) = 0; 460 CvPADLIST (cp) = 0;
408 SvREFCNT_dec (cp); 461 SvREFCNT_dec (cp);
409#else 462#else
… …
413} 466}
414 467
415static void 468static void
416put_padlist (pTHX_ CV *cv) 469put_padlist (pTHX_ CV *cv)
417{ 470{
418 MAGIC *mg = CORO_MAGIC (cv); 471 MAGIC *mg = CORO_MAGIC_cv (cv);
419 AV *av; 472 AV *av;
420 473
421 if (expect_false (!mg)) 474 if (expect_false (!mg))
422 { 475 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
423 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
424 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
425 mg->mg_virtual = &vtbl_coro;
426 mg->mg_obj = (SV *)newAV ();
427 }
428 476
429 av = (AV *)mg->mg_obj; 477 av = (AV *)mg->mg_obj;
430 478
431 if (expect_false (AvFILLp (av) >= AvMAX (av))) 479 if (expect_false (AvFILLp (av) >= AvMAX (av)))
432 av_extend (av, AvMAX (av) + 1); 480 av_extend (av, AvMAX (av) + 1);
… …
450 GvSV (irsgv) = slot->irsgv; 498 GvSV (irsgv) = slot->irsgv;
451 499
452 #define VAR(name,type) PL_ ## name = slot->name; 500 #define VAR(name,type) PL_ ## name = slot->name;
453 # include "state.h" 501 # include "state.h"
454 #undef VAR 502 #undef VAR
455
456 /*hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);*/
457 /*hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);*/
458 503
459 { 504 {
460 dSP; 505 dSP;
461 506
462 CV *cv; 507 CV *cv;
… …
469 CvPADLIST (cv) = (AV *)POPs; 514 CvPADLIST (cv) = (AV *)POPs;
470 } 515 }
471 516
472 PUTBACK; 517 PUTBACK;
473 } 518 }
519
520 slf_frame = c->slf_frame;
474} 521}
475 522
476static void 523static void
477save_perl (pTHX_ Coro__State c) 524save_perl (pTHX_ Coro__State c)
478{ 525{
526 c->slf_frame = slf_frame;
527
479 { 528 {
480 dSP; 529 dSP;
481 I32 cxix = cxstack_ix; 530 I32 cxix = cxstack_ix;
482 PERL_CONTEXT *ccstk = cxstack; 531 PERL_CONTEXT *ccstk = cxstack;
483 PERL_SI *top_si = PL_curstackinfo; 532 PERL_SI *top_si = PL_curstackinfo;
… …
501 550
502 if (expect_true (CvDEPTH (cv))) 551 if (expect_true (CvDEPTH (cv)))
503 { 552 {
504 EXTEND (SP, 3); 553 EXTEND (SP, 3);
505 PUSHs ((SV *)CvPADLIST (cv)); 554 PUSHs ((SV *)CvPADLIST (cv));
506 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 555 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
507 PUSHs ((SV *)cv); 556 PUSHs ((SV *)cv);
508 557
509 CvDEPTH (cv) = 0; 558 CvDEPTH (cv) = 0;
510 get_padlist (aTHX_ cv); 559 get_padlist (aTHX_ cv);
511 } 560 }
… …
550 #undef VAR 599 #undef VAR
551 } 600 }
552} 601}
553 602
554/* 603/*
555 * allocate various perl stacks. This is an exact copy 604 * allocate various perl stacks. This is almost an exact copy
556 * of perl.c:init_stacks, except that it uses less memory 605 * of perl.c:init_stacks, except that it uses less memory
557 * on the (sometimes correct) assumption that coroutines do 606 * on the (sometimes correct) assumption that coroutines do
558 * not usually need a lot of stackspace. 607 * not usually need a lot of stackspace.
559 */ 608 */
560#if CORO_PREFER_PERL_FUNCTIONS 609#if CORO_PREFER_PERL_FUNCTIONS
… …
591 640
592 New(54,PL_savestack,24,ANY); 641 New(54,PL_savestack,24,ANY);
593 PL_savestack_ix = 0; 642 PL_savestack_ix = 0;
594 PL_savestack_max = 24; 643 PL_savestack_max = 24;
595 644
596#if !PERL_VERSION_ATLEAST (5,9,0) 645#if !PERL_VERSION_ATLEAST (5,10,0)
597 New(54,PL_retstack,4,OP*); 646 New(54,PL_retstack,4,OP*);
598 PL_retstack_ix = 0; 647 PL_retstack_ix = 0;
599 PL_retstack_max = 4; 648 PL_retstack_max = 4;
600#endif 649#endif
601} 650}
… …
603 652
604/* 653/*
605 * destroy the stacks, the callchain etc... 654 * destroy the stacks, the callchain etc...
606 */ 655 */
607static void 656static void
608coro_destroy_stacks (pTHX) 657coro_destruct_stacks (pTHX)
609{ 658{
610 while (PL_curstackinfo->si_next) 659 while (PL_curstackinfo->si_next)
611 PL_curstackinfo = PL_curstackinfo->si_next; 660 PL_curstackinfo = PL_curstackinfo->si_next;
612 661
613 while (PL_curstackinfo) 662 while (PL_curstackinfo)
… …
624 673
625 Safefree (PL_tmps_stack); 674 Safefree (PL_tmps_stack);
626 Safefree (PL_markstack); 675 Safefree (PL_markstack);
627 Safefree (PL_scopestack); 676 Safefree (PL_scopestack);
628 Safefree (PL_savestack); 677 Safefree (PL_savestack);
629#if !PERL_VERSION_ATLEAST (5,9,0) 678#if !PERL_VERSION_ATLEAST (5,10,0)
630 Safefree (PL_retstack); 679 Safefree (PL_retstack);
631#endif 680#endif
632} 681}
633 682
634static size_t 683static size_t
… …
650 #undef VAR 699 #undef VAR
651 } 700 }
652 else 701 else
653 slot = coro->slot; 702 slot = coro->slot;
654 703
704 if (slot)
705 {
655 rss += sizeof (slot->curstackinfo); 706 rss += sizeof (slot->curstackinfo);
656 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 707 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
657 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 708 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
658 rss += slot->tmps_max * sizeof (SV *); 709 rss += slot->tmps_max * sizeof (SV *);
659 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 710 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
660 rss += slot->scopestack_max * sizeof (I32); 711 rss += slot->scopestack_max * sizeof (I32);
661 rss += slot->savestack_max * sizeof (ANY); 712 rss += slot->savestack_max * sizeof (ANY);
662 713
663#if !PERL_VERSION_ATLEAST (5,9,0) 714#if !PERL_VERSION_ATLEAST (5,10,0)
664 rss += slot->retstack_max * sizeof (OP *); 715 rss += slot->retstack_max * sizeof (OP *);
665#endif 716#endif
717 }
666 } 718 }
667 719
668 return rss; 720 return rss;
669} 721}
670 722
671/** coroutine stack handling ************************************************/ 723/** coroutine stack handling ************************************************/
724
725static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
726static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
727static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
728
729/* apparently < 5.8.8 */
730#ifndef MgPV_nolen_const
731#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
732 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
733 (const char*)(mg)->mg_ptr)
734#endif
735
736/*
737 * This overrides the default magic get method of %SIG elements.
738 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
739 * and instead of tryign to save and restore the hash elements, we just provide
740 * readback here.
741 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
742 * not expecting this to actually change the hook. This is a potential problem
743 * when a schedule happens then, but we ignore this.
744 */
745static int
746coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
747{
748 const char *s = MgPV_nolen_const (mg);
749
750 if (*s == '_')
751 {
752 SV **svp = 0;
753
754 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
755 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
756
757 if (svp)
758 {
759 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
760 return 0;
761 }
762 }
763
764 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
765}
766
767static int
768coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
769{
770 const char *s = MgPV_nolen_const (mg);
771
772 if (*s == '_')
773 {
774 SV **svp = 0;
775
776 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
777 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
778
779 if (svp)
780 {
781 SV *old = *svp;
782 *svp = 0;
783 SvREFCNT_dec (old);
784 return 0;
785 }
786 }
787
788 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
789}
790
791static int
792coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
793{
794 const char *s = MgPV_nolen_const (mg);
795
796 if (*s == '_')
797 {
798 SV **svp = 0;
799
800 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
801 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
802
803 if (svp)
804 {
805 SV *old = *svp;
806 *svp = newSVsv (sv);
807 SvREFCNT_dec (old);
808 return 0;
809 }
810 }
811
812 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
813}
814
815static void
816prepare_nop (aTHX_ struct coro_transfer_args *ta)
817{
818 /* kind of mega-hacky, but works */
819 ta->next = ta->prev = (struct coro *)ta;
820}
821
822static int
823slf_check_nop (aTHX)
824{
825 return 0;
826}
672 827
673static void 828static void
674coro_setup (pTHX_ struct coro *coro) 829coro_setup (pTHX_ struct coro *coro)
675{ 830{
676 /* 831 /*
… …
685 PL_curpm = 0; 840 PL_curpm = 0;
686 PL_curpad = 0; 841 PL_curpad = 0;
687 PL_localizing = 0; 842 PL_localizing = 0;
688 PL_dirty = 0; 843 PL_dirty = 0;
689 PL_restartop = 0; 844 PL_restartop = 0;
845#if PERL_VERSION_ATLEAST (5,10,0)
846 PL_parser = 0;
847#endif
848
849 /* recreate the die/warn hooks */
690 PL_diehook = 0; hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0); 850 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
691 PL_warnhook = 0; hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0); 851 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
692 852
693 GvSV (PL_defgv) = newSV (0); 853 GvSV (PL_defgv) = newSV (0);
694 GvAV (PL_defgv) = coro->args; coro->args = 0; 854 GvAV (PL_defgv) = coro->args; coro->args = 0;
695 GvSV (PL_errgv) = newSV (0); 855 GvSV (PL_errgv) = newSV (0);
696 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 856 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
697 PL_rs = newSVsv (GvSV (irsgv)); 857 PL_rs = newSVsv (GvSV (irsgv));
698 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv); 858 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
699 859
700 { 860 {
701 dSP; 861 dSP;
702 LOGOP myop; 862 UNOP myop;
703 863
704 Zero (&myop, 1, LOGOP); 864 Zero (&myop, 1, UNOP);
705 myop.op_next = Nullop; 865 myop.op_next = Nullop;
706 myop.op_flags = OPf_WANT_VOID; 866 myop.op_flags = OPf_WANT_VOID;
707 867
708 PUSHMARK (SP); 868 PUSHMARK (SP);
709 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 869 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
… …
712 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 872 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
713 SPAGAIN; 873 SPAGAIN;
714 } 874 }
715 875
716 /* this newly created coroutine might be run on an existing cctx which most 876 /* this newly created coroutine might be run on an existing cctx which most
717 * likely was suspended in set_stacklevel, called from entersub. 877 * likely was suspended in pp_slf, so we have to emulate entering pp_slf here.
718 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
719 * so we ENTER here for symmetry
720 */ 878 */
721 ENTER; 879 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
880 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
722} 881}
723 882
724static void 883static void
725coro_destroy (pTHX_ struct coro *coro) 884coro_destruct (pTHX_ struct coro *coro)
726{ 885{
727 if (!IN_DESTRUCT) 886 if (!IN_DESTRUCT)
728 { 887 {
729 /* restore all saved variables and stuff */ 888 /* restore all saved variables and stuff */
730 LEAVE_SCOPE (0); 889 LEAVE_SCOPE (0);
… …
752 SvREFCNT_dec (PL_warnhook); 911 SvREFCNT_dec (PL_warnhook);
753 912
754 SvREFCNT_dec (coro->saved_deffh); 913 SvREFCNT_dec (coro->saved_deffh);
755 SvREFCNT_dec (coro->throw); 914 SvREFCNT_dec (coro->throw);
756 915
757 coro_destroy_stacks (aTHX); 916 coro_destruct_stacks (aTHX);
758} 917}
759 918
760static void 919INLINE void
761free_coro_mortal (pTHX) 920free_coro_mortal (pTHX)
762{ 921{
763 if (expect_true (coro_mortal)) 922 if (expect_true (coro_mortal))
764 { 923 {
765 SvREFCNT_dec (coro_mortal); 924 SvREFCNT_dec (coro_mortal);
… …
799 : cx->blk_gimme == G_SCALAR ? bot + 1 958 : cx->blk_gimme == G_SCALAR ? bot + 1
800 : bot; 959 : bot;
801 960
802 av_extend (av, top - bot); 961 av_extend (av, top - bot);
803 while (bot < top) 962 while (bot < top)
804 av_push (av, SvREFCNT_inc (*bot++)); 963 av_push (av, SvREFCNT_inc_NN (*bot++));
805 964
806 PL_runops = RUNOPS_DEFAULT; 965 PL_runops = RUNOPS_DEFAULT;
807 ENTER; 966 ENTER;
808 SAVETMPS; 967 SAVETMPS;
809 EXTEND (SP, 3); 968 EXTEND (SP, 3);
… …
847 SAVETMPS; 1006 SAVETMPS;
848 EXTEND (SP, 3); 1007 EXTEND (SP, 3);
849 PUSHMARK (SP); 1008 PUSHMARK (SP);
850 PUSHs (&PL_sv_yes); 1009 PUSHs (&PL_sv_yes);
851 PUSHs (fullname); 1010 PUSHs (fullname);
852 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1011 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
853 PUTBACK; 1012 PUTBACK;
854 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1013 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
855 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1014 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
856 SPAGAIN; 1015 SPAGAIN;
857 FREETMPS; 1016 FREETMPS;
… …
889 1048
890 TAINT_NOT; 1049 TAINT_NOT;
891 return 0; 1050 return 0;
892} 1051}
893 1052
1053static void
1054prepare_set_stacklevel (struct coro_transfer_args *ta, struct coro_cctx *cctx)
1055{
1056 ta->prev = (struct coro *)cctx;
1057 ta->next = 0;
1058}
1059
894/* inject a fake call to Coro::State::_cctx_init into the execution */ 1060/* inject a fake call to Coro::State::_cctx_init into the execution */
895/* _cctx_init should be careful, as it could be called at almost any time */ 1061/* _cctx_init should be careful, as it could be called at almost any time */
896/* during execution of a perl program */ 1062/* during execution of a perl program */
1063/* also initialises PL_top_env */
897static void NOINLINE 1064static void NOINLINE
898cctx_prepare (pTHX_ coro_cctx *cctx) 1065cctx_prepare (pTHX_ coro_cctx *cctx)
899{ 1066{
900 dSP; 1067 dSP;
901 LOGOP myop; 1068 UNOP myop;
902 1069
903 PL_top_env = &PL_start_env; 1070 PL_top_env = &PL_start_env;
904 1071
905 if (cctx->flags & CC_TRACE) 1072 if (cctx->flags & CC_TRACE)
906 PL_runops = runops_trace; 1073 PL_runops = runops_trace;
907 1074
908 Zero (&myop, 1, LOGOP); 1075 Zero (&myop, 1, UNOP);
909 myop.op_next = PL_op; 1076 myop.op_next = PL_op;
910 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1077 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
911 1078
912 PUSHMARK (SP); 1079 PUSHMARK (SP);
913 EXTEND (SP, 2); 1080 EXTEND (SP, 2);
914 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1081 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
915 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1082 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
916 PUTBACK; 1083 PUTBACK;
917 PL_op = (OP *)&myop; 1084 PL_op = (OP *)&myop;
918 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1085 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
919 SPAGAIN; 1086 SPAGAIN;
920} 1087}
921 1088
1089/* the tail of transfer: execute stuff we can only do after a transfer */
1090INLINE void
1091transfer_tail (pTHX)
1092{
1093 struct coro *next = (struct coro *)transfer_next;
1094 assert (!(transfer_next = 0)); /* just used for the side effect when asserts are enabled */
1095 assert (("FATAL: next coroutine was zero in transfer_tail (please report)", next));
1096
1097 free_coro_mortal (aTHX);
1098 UNLOCK;
1099
1100 if (expect_false (next->throw))
1101 {
1102 SV *exception = sv_2mortal (next->throw);
1103
1104 next->throw = 0;
1105 sv_setsv (ERRSV, exception);
1106 croak (0);
1107 }
1108}
1109
922/* 1110/*
923 * this is a _very_ stripped down perl interpreter ;) 1111 * this is a _very_ stripped down perl interpreter ;)
924 */ 1112 */
925static void 1113static void
926cctx_run (void *arg) 1114cctx_run (void *arg)
927{ 1115{
1116#ifdef USE_ITHREADS
1117# if CORO_PTHREAD
1118 PERL_SET_CONTEXT (coro_thx);
1119# endif
1120#endif
1121 {
928 dTHX; 1122 dTHX;
929 1123
930 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1124 /* normally we would need to skip the entersub here */
931 UNLOCK; 1125 /* not doing so will re-execute it, which is exactly what we want */
932
933 /* we now skip the entersub that lead to transfer() */
934 PL_op = PL_op->op_next; 1126 /* PL_nop = PL_nop->op_next */
935 1127
936 /* inject a fake subroutine call to cctx_init */ 1128 /* inject a fake subroutine call to cctx_init */
937 cctx_prepare (aTHX_ (coro_cctx *)arg); 1129 cctx_prepare (aTHX_ (coro_cctx *)arg);
938 1130
1131 /* cctx_run is the alternative tail of transfer() */
1132 /* TODO: throwing an exception here might be deadly, VERIFY */
1133 transfer_tail (aTHX);
1134
939 /* somebody or something will hit me for both perl_run and PL_restartop */ 1135 /* somebody or something will hit me for both perl_run and PL_restartop */
940 PL_restartop = PL_op; 1136 PL_restartop = PL_op;
941 perl_run (PL_curinterp); 1137 perl_run (PL_curinterp);
942 1138
943 /* 1139 /*
944 * If perl-run returns we assume exit() was being called or the coro 1140 * If perl-run returns we assume exit() was being called or the coro
945 * fell off the end, which seems to be the only valid (non-bug) 1141 * fell off the end, which seems to be the only valid (non-bug)
946 * reason for perl_run to return. We try to exit by jumping to the 1142 * reason for perl_run to return. We try to exit by jumping to the
947 * bootstrap-time "top" top_env, as we cannot restore the "main" 1143 * bootstrap-time "top" top_env, as we cannot restore the "main"
948 * coroutine as Coro has no such concept 1144 * coroutine as Coro has no such concept
949 */ 1145 */
950 PL_top_env = main_top_env; 1146 PL_top_env = main_top_env;
951 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1147 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1148 }
952} 1149}
953 1150
954static coro_cctx * 1151static coro_cctx *
955cctx_new () 1152cctx_new ()
956{ 1153{
957 coro_cctx *cctx; 1154 coro_cctx *cctx;
1155
1156 ++cctx_count;
1157 New (0, cctx, 1, coro_cctx);
1158
1159 cctx->gen = cctx_gen;
1160 cctx->flags = 0;
1161 cctx->idle_sp = 0; /* can be accessed by transfer between cctx_run and set_stacklevel, on throw */
1162
1163 return cctx;
1164}
1165
1166/* create a new cctx only suitable as source */
1167static coro_cctx *
1168cctx_new_empty ()
1169{
1170 coro_cctx *cctx = cctx_new ();
1171
1172 cctx->sptr = 0;
1173 coro_create (&cctx->cctx, 0, 0, 0, 0);
1174
1175 return cctx;
1176}
1177
1178/* create a new cctx suitable as destination/running a perl interpreter */
1179static coro_cctx *
1180cctx_new_run ()
1181{
1182 coro_cctx *cctx = cctx_new ();
958 void *stack_start; 1183 void *stack_start;
959 size_t stack_size; 1184 size_t stack_size;
960 1185
961 ++cctx_count;
962
963 Newz (0, cctx, 1, coro_cctx);
964
965#if HAVE_MMAP 1186#if HAVE_MMAP
966 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1187 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
967 /* mmap supposedly does allocate-on-write for us */ 1188 /* mmap supposedly does allocate-on-write for us */
968 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1189 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
969 1190
970 if (cctx->sptr != (void *)-1) 1191 if (cctx->sptr != (void *)-1)
971 { 1192 {
972# if CORO_STACKGUARD 1193 #if CORO_STACKGUARD
973 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1194 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
974# endif 1195 #endif
975 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1196 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
976 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1197 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
977 cctx->flags |= CC_MAPPED; 1198 cctx->flags |= CC_MAPPED;
978 } 1199 }
979 else 1200 else
980#endif 1201#endif
981 { 1202 {
982 cctx->ssize = coro_stacksize * (long)sizeof (long); 1203 cctx->ssize = cctx_stacksize * (long)sizeof (long);
983 New (0, cctx->sptr, coro_stacksize, long); 1204 New (0, cctx->sptr, cctx_stacksize, long);
984 1205
985 if (!cctx->sptr) 1206 if (!cctx->sptr)
986 { 1207 {
987 perror ("FATAL: unable to allocate stack for coroutine"); 1208 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
988 _exit (EXIT_FAILURE); 1209 _exit (EXIT_FAILURE);
989 } 1210 }
990 1211
991 stack_start = cctx->sptr; 1212 stack_start = cctx->sptr;
992 stack_size = cctx->ssize; 1213 stack_size = cctx->ssize;
993 } 1214 }
994 1215
995 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1216 #if CORO_USE_VALGRIND
1217 cctx->valgrind_id = VALGRIND_STACK_REGISTER ((char *)stack_start, (char *)stack_start + stack_size);
1218 #endif
1219
996 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size); 1220 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
997 1221
998 return cctx; 1222 return cctx;
999} 1223}
1000 1224
… …
1003{ 1227{
1004 if (!cctx) 1228 if (!cctx)
1005 return; 1229 return;
1006 1230
1007 --cctx_count; 1231 --cctx_count;
1232 coro_destroy (&cctx->cctx);
1008 1233
1234 /* coro_transfer creates new, empty cctx's */
1235 if (cctx->sptr)
1236 {
1009#if CORO_USE_VALGRIND 1237 #if CORO_USE_VALGRIND
1010 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1238 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1011#endif 1239 #endif
1012 1240
1013#if HAVE_MMAP 1241#if HAVE_MMAP
1014 if (cctx->flags & CC_MAPPED) 1242 if (cctx->flags & CC_MAPPED)
1015 munmap (cctx->sptr, cctx->ssize); 1243 munmap (cctx->sptr, cctx->ssize);
1016 else 1244 else
1017#endif 1245#endif
1018 Safefree (cctx->sptr); 1246 Safefree (cctx->sptr);
1247 }
1019 1248
1020 Safefree (cctx); 1249 Safefree (cctx);
1021} 1250}
1022 1251
1023/* wether this cctx should be destructed */ 1252/* wether this cctx should be destructed */
1024#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE)) 1253#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1025 1254
1026static coro_cctx * 1255static coro_cctx *
1027cctx_get (pTHX) 1256cctx_get (pTHX)
1028{ 1257{
1029 while (expect_true (cctx_first)) 1258 while (expect_true (cctx_first))
… …
1036 return cctx; 1265 return cctx;
1037 1266
1038 cctx_destroy (cctx); 1267 cctx_destroy (cctx);
1039 } 1268 }
1040 1269
1041 return cctx_new (); 1270 return cctx_new_run ();
1042} 1271}
1043 1272
1044static void 1273static void
1045cctx_put (coro_cctx *cctx) 1274cctx_put (coro_cctx *cctx)
1046{ 1275{
1276 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1277
1047 /* free another cctx if overlimit */ 1278 /* free another cctx if overlimit */
1048 if (expect_false (cctx_idle >= MAX_IDLE_CCTX)) 1279 if (expect_false (cctx_idle >= cctx_max_idle))
1049 { 1280 {
1050 coro_cctx *first = cctx_first; 1281 coro_cctx *first = cctx_first;
1051 cctx_first = first->next; 1282 cctx_first = first->next;
1052 --cctx_idle; 1283 --cctx_idle;
1053 1284
… …
1065transfer_check (pTHX_ struct coro *prev, struct coro *next) 1296transfer_check (pTHX_ struct coro *prev, struct coro *next)
1066{ 1297{
1067 if (expect_true (prev != next)) 1298 if (expect_true (prev != next))
1068 { 1299 {
1069 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1300 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1070 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1301 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states,");
1071 1302
1072 if (expect_false (next->flags & CF_RUNNING)) 1303 if (expect_false (next->flags & CF_RUNNING))
1073 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1304 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1074 1305
1075 if (expect_false (next->flags & CF_DESTROYED)) 1306 if (expect_false (next->flags & CF_DESTROYED))
1076 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1307 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,");
1077 1308
1078 if (
1079#if PERL_VERSION_ATLEAST (5,9,0) 1309#if !PERL_VERSION_ATLEAST (5,10,0)
1080 expect_false (PL_parser)
1081#else
1082 expect_false (PL_lex_state != LEX_NOTPARSING) 1310 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1083#endif
1084 )
1085 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1311 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1312#endif
1086 } 1313 }
1087} 1314}
1088 1315
1089/* always use the TRANSFER macro */ 1316/* always use the TRANSFER macro */
1090static void NOINLINE 1317static void NOINLINE
1091transfer (pTHX_ struct coro *prev, struct coro *next) 1318transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1092{ 1319{
1093 dSTACKLEVEL; 1320 dSTACKLEVEL;
1094 1321
1095 /* sometimes transfer is only called to set idle_sp */ 1322 /* sometimes transfer is only called to set idle_sp */
1096 if (expect_false (!next)) 1323 if (expect_false (!next))
1097 { 1324 {
1098 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1325 ((coro_cctx *)prev)->idle_sp = stacklevel;
1099 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1326 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1100 } 1327 }
1101 else if (expect_true (prev != next)) 1328 else if (expect_true (prev != next))
1102 { 1329 {
1103 coro_cctx *prev__cctx; 1330 coro_cctx *prev__cctx;
1104 1331
1105 if (expect_false (prev->flags & CF_NEW)) 1332 if (expect_false (prev->flags & CF_NEW))
1106 { 1333 {
1107 /* create a new empty context */ 1334 /* create a new empty/source context */
1108 Newz (0, prev->cctx, 1, coro_cctx); 1335 prev->cctx = cctx_new_empty ();
1109 prev->flags &= ~CF_NEW; 1336 prev->flags &= ~CF_NEW;
1110 prev->flags |= CF_RUNNING; 1337 prev->flags |= CF_RUNNING;
1111 } 1338 }
1112 1339
1113 prev->flags &= ~CF_RUNNING; 1340 prev->flags &= ~CF_RUNNING;
1114 next->flags |= CF_RUNNING; 1341 next->flags |= CF_RUNNING;
1115 1342
1116 LOCK; 1343 LOCK;
1344
1345 /* first get rid of the old state */
1346 save_perl (aTHX_ prev);
1117 1347
1118 if (expect_false (next->flags & CF_NEW)) 1348 if (expect_false (next->flags & CF_NEW))
1119 { 1349 {
1120 /* need to start coroutine */ 1350 /* need to start coroutine */
1121 next->flags &= ~CF_NEW; 1351 next->flags &= ~CF_NEW;
1122 /* first get rid of the old state */
1123 save_perl (aTHX_ prev);
1124 /* setup coroutine call */ 1352 /* setup coroutine call */
1125 coro_setup (aTHX_ next); 1353 coro_setup (aTHX_ next);
1126 } 1354 }
1127 else 1355 else
1356 load_perl (aTHX_ next);
1357
1358 prev__cctx = prev->cctx;
1359
1360 /* possibly untie and reuse the cctx */
1361 if (expect_true (
1362 prev__cctx->idle_sp == stacklevel
1363 && !(prev__cctx->flags & CC_TRACE)
1364 && !force_cctx
1365 ))
1128 { 1366 {
1129 /* coroutine already started */
1130 save_perl (aTHX_ prev);
1131 load_perl (aTHX_ next);
1132 }
1133
1134 prev__cctx = prev->cctx;
1135
1136 /* possibly "free" the cctx */
1137 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1138 {
1139 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1367 /* I assume that stacklevel is a stronger indicator than PL_top_env changes */
1140 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1368 assert (("FATAL: current top_env must equal previous top_env in Coro (please report)", PL_top_env == prev__cctx->idle_te));
1141 1369
1142 prev->cctx = 0; 1370 prev->cctx = 0;
1143 1371
1144 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */ 1372 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1145 /* without this the next cctx_get might destroy the prev__cctx while still in use */ 1373 /* without this the next cctx_get might destroy the prev__cctx while still in use */
… …
1152 1380
1153 ++next->usecount; 1381 ++next->usecount;
1154 1382
1155 if (expect_true (!next->cctx)) 1383 if (expect_true (!next->cctx))
1156 next->cctx = cctx_get (aTHX); 1384 next->cctx = cctx_get (aTHX);
1385
1386 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1387 transfer_next = next;
1157 1388
1158 if (expect_false (prev__cctx != next->cctx)) 1389 if (expect_false (prev__cctx != next->cctx))
1159 { 1390 {
1160 prev__cctx->top_env = PL_top_env; 1391 prev__cctx->top_env = PL_top_env;
1161 PL_top_env = next->cctx->top_env; 1392 PL_top_env = next->cctx->top_env;
1162 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1393 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1163 } 1394 }
1164 1395
1165 free_coro_mortal (aTHX); 1396 transfer_tail (aTHX);
1166 UNLOCK;
1167
1168 if (expect_false (prev->throw || next->throw))
1169 {
1170 struct coro *coro = SvSTATE (coro_current);
1171
1172 if (coro->throw)
1173 {
1174 SV *exception = coro->throw;
1175 coro->throw = 0;
1176 sv_setsv (ERRSV, exception);
1177 croak (0);
1178 }
1179 }
1180 } 1397 }
1181} 1398}
1182 1399
1183struct transfer_args
1184{
1185 struct coro *prev, *next;
1186};
1187
1188#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1400#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1189#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1401#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1190 1402
1191/** high level stuff ********************************************************/ 1403/** high level stuff ********************************************************/
1192 1404
1193static int 1405static int
… …
1211 1423
1212 if (coro->mainstack && coro->mainstack != main_mainstack) 1424 if (coro->mainstack && coro->mainstack != main_mainstack)
1213 { 1425 {
1214 struct coro temp; 1426 struct coro temp;
1215 1427
1216 if (coro->flags & CF_RUNNING) 1428 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1217 croak ("FATAL: tried to destroy currently running coroutine");
1218 1429
1219 save_perl (aTHX_ &temp); 1430 save_perl (aTHX_ &temp);
1220 load_perl (aTHX_ coro); 1431 load_perl (aTHX_ coro);
1221 1432
1222 coro_destroy (aTHX_ coro); 1433 coro_destruct (aTHX_ coro);
1223 1434
1224 load_perl (aTHX_ &temp); 1435 load_perl (aTHX_ &temp);
1225 1436
1226 coro->slot = 0; 1437 coro->slot = 0;
1227 } 1438 }
… …
1273# define MGf_DUP 0 1484# define MGf_DUP 0
1274#endif 1485#endif
1275}; 1486};
1276 1487
1277static void 1488static void
1278prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1489prepare_transfer (pTHX_ struct coro_transfer_args *ta, SV *prev_sv, SV *next_sv)
1279{ 1490{
1280 ta->prev = SvSTATE (prev_sv); 1491 ta->prev = SvSTATE (prev_sv);
1281 ta->next = SvSTATE (next_sv); 1492 ta->next = SvSTATE (next_sv);
1282 TRANSFER_CHECK (*ta); 1493 TRANSFER_CHECK (*ta);
1283} 1494}
1284 1495
1285static void 1496static void
1286api_transfer (SV *prev_sv, SV *next_sv) 1497api_transfer (pTHX_ SV *prev_sv, SV *next_sv)
1287{ 1498{
1288 dTHX;
1289 struct transfer_args ta; 1499 struct coro_transfer_args ta;
1290 1500
1291 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1501 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1292 TRANSFER (ta); 1502 TRANSFER (ta, 1);
1293} 1503}
1294 1504
1295/** Coro ********************************************************************/ 1505/** Coro ********************************************************************/
1296 1506
1297static void 1507static void
… …
1299{ 1509{
1300 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1510 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1301} 1511}
1302 1512
1303static SV * 1513static SV *
1304coro_deq (pTHX_ int min_prio) 1514coro_deq (pTHX)
1305{ 1515{
1306 int prio = PRIO_MAX - PRIO_MIN; 1516 int prio;
1307 1517
1308 min_prio -= PRIO_MIN;
1309 if (min_prio < 0)
1310 min_prio = 0;
1311
1312 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1518 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1313 if (AvFILLp (coro_ready [prio]) >= 0) 1519 if (AvFILLp (coro_ready [prio]) >= 0)
1314 return av_shift (coro_ready [prio]); 1520 return av_shift (coro_ready [prio]);
1315 1521
1316 return 0; 1522 return 0;
1317} 1523}
1318 1524
1319static int 1525static int
1320api_ready (SV *coro_sv) 1526api_ready (pTHX_ SV *coro_sv)
1321{ 1527{
1322 dTHX;
1323 struct coro *coro; 1528 struct coro *coro;
1529 SV *sv_hook;
1530 void (*xs_hook)(void);
1324 1531
1325 if (SvROK (coro_sv)) 1532 if (SvROK (coro_sv))
1326 coro_sv = SvRV (coro_sv); 1533 coro_sv = SvRV (coro_sv);
1327 1534
1328 coro = SvSTATE (coro_sv); 1535 coro = SvSTATE (coro_sv);
… …
1331 return 0; 1538 return 0;
1332 1539
1333 coro->flags |= CF_READY; 1540 coro->flags |= CF_READY;
1334 1541
1335 LOCK; 1542 LOCK;
1543
1544 sv_hook = coro_nready ? 0 : coro_readyhook;
1545 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1546
1336 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1547 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1337 ++coro_nready; 1548 ++coro_nready;
1549
1338 UNLOCK; 1550 UNLOCK;
1551
1552 if (sv_hook)
1553 {
1554 dSP;
1555
1556 ENTER;
1557 SAVETMPS;
1558
1559 PUSHMARK (SP);
1560 PUTBACK;
1561 call_sv (sv_hook, G_DISCARD);
1562 SPAGAIN;
1563
1564 FREETMPS;
1565 LEAVE;
1566 }
1567
1568 if (xs_hook)
1569 xs_hook ();
1339 1570
1340 return 1; 1571 return 1;
1341} 1572}
1342 1573
1343static int 1574static int
1344api_is_ready (SV *coro_sv) 1575api_is_ready (pTHX_ SV *coro_sv)
1345{ 1576{
1346 dTHX;
1347 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1577 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1348} 1578}
1349 1579
1350static void 1580INLINE void
1351prepare_schedule (pTHX_ struct transfer_args *ta) 1581prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1352{ 1582{
1353 SV *prev_sv, *next_sv; 1583 SV *prev_sv, *next_sv;
1354 1584
1355 for (;;) 1585 for (;;)
1356 { 1586 {
1357 LOCK; 1587 LOCK;
1358 next_sv = coro_deq (aTHX_ PRIO_MIN); 1588 next_sv = coro_deq (aTHX);
1359 1589
1360 /* nothing to schedule: call the idle handler */ 1590 /* nothing to schedule: call the idle handler */
1361 if (expect_false (!next_sv)) 1591 if (expect_false (!next_sv))
1362 { 1592 {
1363 dSP; 1593 dSP;
… …
1367 SAVETMPS; 1597 SAVETMPS;
1368 1598
1369 PUSHMARK (SP); 1599 PUSHMARK (SP);
1370 PUTBACK; 1600 PUTBACK;
1371 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1601 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1602 SPAGAIN;
1372 1603
1373 FREETMPS; 1604 FREETMPS;
1374 LEAVE; 1605 LEAVE;
1375 continue; 1606 continue;
1376 } 1607 }
… …
1380 /* cannot transfer to destroyed coros, skip and look for next */ 1611 /* cannot transfer to destroyed coros, skip and look for next */
1381 if (expect_false (ta->next->flags & CF_DESTROYED)) 1612 if (expect_false (ta->next->flags & CF_DESTROYED))
1382 { 1613 {
1383 UNLOCK; 1614 UNLOCK;
1384 SvREFCNT_dec (next_sv); 1615 SvREFCNT_dec (next_sv);
1385 /* coro_nready is already taken care of by destroy */ 1616 /* coro_nready has already been taken care of by destroy */
1386 continue; 1617 continue;
1387 } 1618 }
1388 1619
1389 --coro_nready; 1620 --coro_nready;
1390 UNLOCK; 1621 UNLOCK;
… …
1393 1624
1394 /* free this only after the transfer */ 1625 /* free this only after the transfer */
1395 prev_sv = SvRV (coro_current); 1626 prev_sv = SvRV (coro_current);
1396 ta->prev = SvSTATE (prev_sv); 1627 ta->prev = SvSTATE (prev_sv);
1397 TRANSFER_CHECK (*ta); 1628 TRANSFER_CHECK (*ta);
1398 assert (ta->next->flags & CF_READY); 1629 assert (("FATAL: next coroutine isn't marked as ready in Coro (please report)", ta->next->flags & CF_READY));
1399 ta->next->flags &= ~CF_READY; 1630 ta->next->flags &= ~CF_READY;
1400 SvRV_set (coro_current, next_sv); 1631 SvRV_set (coro_current, next_sv);
1401 1632
1402 LOCK; 1633 LOCK;
1403 free_coro_mortal (aTHX); 1634 free_coro_mortal (aTHX);
1404 coro_mortal = prev_sv; 1635 coro_mortal = prev_sv;
1405 UNLOCK; 1636 UNLOCK;
1406} 1637}
1407 1638
1408static void 1639INLINE void
1409prepare_cede (pTHX_ struct transfer_args *ta) 1640prepare_cede (pTHX_ struct coro_transfer_args *ta)
1410{ 1641{
1411 api_ready (coro_current); 1642 api_ready (aTHX_ coro_current);
1412 prepare_schedule (aTHX_ ta); 1643 prepare_schedule (aTHX_ ta);
1413} 1644}
1414 1645
1646INLINE void
1647prepare_cede_notself (pTHX_ struct coro_transfer_args *ta)
1648{
1649 SV *prev = SvRV (coro_current);
1650
1651 if (coro_nready)
1652 {
1653 prepare_schedule (aTHX_ ta);
1654 api_ready (aTHX_ prev);
1655 }
1656 else
1657 prepare_nop (aTHX_ ta);
1658}
1659
1660static void
1661api_schedule (pTHX)
1662{
1663 struct coro_transfer_args ta;
1664
1665 prepare_schedule (aTHX_ &ta);
1666 TRANSFER (ta, 1);
1667}
1668
1415static int 1669static int
1416prepare_cede_notself (pTHX_ struct transfer_args *ta) 1670api_cede (pTHX)
1417{ 1671{
1418 if (coro_nready) 1672 struct coro_transfer_args ta;
1419 { 1673
1420 SV *prev = SvRV (coro_current);
1421 prepare_schedule (aTHX_ ta); 1674 prepare_cede (aTHX_ &ta);
1422 api_ready (prev); 1675
1676 if (expect_true (ta.prev != ta.next))
1677 {
1678 TRANSFER (ta, 1);
1423 return 1; 1679 return 1;
1424 } 1680 }
1425 else 1681 else
1426 return 0; 1682 return 0;
1427} 1683}
1428 1684
1429static void
1430api_schedule (void)
1431{
1432 dTHX;
1433 struct transfer_args ta;
1434
1435 prepare_schedule (aTHX_ &ta);
1436 TRANSFER (ta);
1437}
1438
1439static int 1685static int
1440api_cede (void) 1686api_cede_notself (pTHX)
1441{ 1687{
1442 dTHX; 1688 if (coro_nready)
1689 {
1443 struct transfer_args ta; 1690 struct coro_transfer_args ta;
1444 1691
1445 prepare_cede (aTHX_ &ta); 1692 prepare_cede_notself (aTHX_ &ta);
1446
1447 if (expect_true (ta.prev != ta.next))
1448 {
1449 TRANSFER (ta); 1693 TRANSFER (ta, 1);
1450 return 1; 1694 return 1;
1451 } 1695 }
1452 else 1696 else
1453 return 0; 1697 return 0;
1454} 1698}
1455 1699
1456static int 1700static void
1457api_cede_notself (void)
1458{
1459 dTHX;
1460 struct transfer_args ta;
1461
1462 if (prepare_cede_notself (aTHX_ &ta))
1463 {
1464 TRANSFER (ta);
1465 return 1;
1466 }
1467 else
1468 return 0;
1469}
1470
1471static void
1472api_trace (SV *coro_sv, int flags) 1701api_trace (pTHX_ SV *coro_sv, int flags)
1473{ 1702{
1474 dTHX;
1475 struct coro *coro = SvSTATE (coro_sv); 1703 struct coro *coro = SvSTATE (coro_sv);
1476 1704
1477 if (flags & CC_TRACE) 1705 if (flags & CC_TRACE)
1478 { 1706 {
1479 if (!coro->cctx) 1707 if (!coro->cctx)
1480 coro->cctx = cctx_new (); 1708 coro->cctx = cctx_new_run ();
1481 else if (!(coro->cctx->flags & CC_TRACE)) 1709 else if (!(coro->cctx->flags & CC_TRACE))
1482 croak ("cannot enable tracing on coroutine with custom stack"); 1710 croak ("cannot enable tracing on coroutine with custom stack,");
1483 1711
1484 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1712 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1485 } 1713 }
1486 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1714 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1487 { 1715 {
… …
1492 else 1720 else
1493 coro->slot->runops = RUNOPS_DEFAULT; 1721 coro->slot->runops = RUNOPS_DEFAULT;
1494 } 1722 }
1495} 1723}
1496 1724
1725#if 0
1726static int
1727coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1728{
1729 AV *padlist;
1730 AV *av = (AV *)mg->mg_obj;
1731
1732 abort ();
1733
1734 return 0;
1735}
1736
1737static MGVTBL coro_gensub_vtbl = {
1738 0, 0, 0, 0,
1739 coro_gensub_free
1740};
1741#endif
1742
1743/*****************************************************************************/
1744/* PerlIO::cede */
1745
1746typedef struct
1747{
1748 PerlIOBuf base;
1749 NV next, every;
1750} PerlIOCede;
1751
1752static IV
1753PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
1754{
1755 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1756
1757 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
1758 self->next = nvtime () + self->every;
1759
1760 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
1761}
1762
1763static SV *
1764PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
1765{
1766 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1767
1768 return newSVnv (self->every);
1769}
1770
1771static IV
1772PerlIOCede_flush (pTHX_ PerlIO *f)
1773{
1774 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1775 double now = nvtime ();
1776
1777 if (now >= self->next)
1778 {
1779 api_cede (aTHX);
1780 self->next = now + self->every;
1781 }
1782
1783 return PerlIOBuf_flush (aTHX_ f);
1784}
1785
1786static PerlIO_funcs PerlIO_cede =
1787{
1788 sizeof(PerlIO_funcs),
1789 "cede",
1790 sizeof(PerlIOCede),
1791 PERLIO_K_DESTRUCT | PERLIO_K_RAW,
1792 PerlIOCede_pushed,
1793 PerlIOBuf_popped,
1794 PerlIOBuf_open,
1795 PerlIOBase_binmode,
1796 PerlIOCede_getarg,
1797 PerlIOBase_fileno,
1798 PerlIOBuf_dup,
1799 PerlIOBuf_read,
1800 PerlIOBuf_unread,
1801 PerlIOBuf_write,
1802 PerlIOBuf_seek,
1803 PerlIOBuf_tell,
1804 PerlIOBuf_close,
1805 PerlIOCede_flush,
1806 PerlIOBuf_fill,
1807 PerlIOBase_eof,
1808 PerlIOBase_error,
1809 PerlIOBase_clearerr,
1810 PerlIOBase_setlinebuf,
1811 PerlIOBuf_get_base,
1812 PerlIOBuf_bufsiz,
1813 PerlIOBuf_get_ptr,
1814 PerlIOBuf_get_cnt,
1815 PerlIOBuf_set_ptrcnt,
1816};
1817
1818/*****************************************************************************/
1819
1820static const CV *slf_cv; /* for quick consistency check */
1821
1822static UNOP slf_restore; /* restore stack as entersub did, for first-re-run */
1823static SV *slf_arg0;
1824static SV *slf_arg1;
1825static SV *slf_arg2;
1826
1827/* this restores the stack in the case we patched the entersub, to */
1828/* recreate the stack frame as perl will on following calls */
1829/* since entersub cleared the stack */
1830static OP *
1831pp_restore (pTHX)
1832{
1833 dSP;
1834
1835 PUSHMARK (SP);
1836
1837 EXTEND (SP, 3);
1838 if (slf_arg0) PUSHs (sv_2mortal (slf_arg0));
1839 if (slf_arg1) PUSHs (sv_2mortal (slf_arg1));
1840 if (slf_arg2) PUSHs (sv_2mortal (slf_arg2));
1841 PUSHs ((SV *)CvGV (slf_cv));
1842
1843 RETURNOP (slf_restore.op_first);
1844}
1845
1846static void
1847slf_prepare_set_stacklevel (pTHX_ struct coro_transfer_args *ta)
1848{
1849 prepare_set_stacklevel (ta, (struct coro_cctx *)slf_frame.data);
1850}
1851
1852static void
1853slf_init_set_stacklevel (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1854{
1855 assert (("FATAL: set_stacklevel needs the coro cctx as sole argument", items == 1));
1856
1857 frame->prepare = slf_prepare_set_stacklevel;
1858 frame->check = slf_check_nop;
1859 frame->data = (void *)SvIV (arg [0]);
1860}
1861
1862static void
1863slf_prepare_transfer (pTHX_ struct coro_transfer_args *ta)
1864{
1865 SV **arg = (SV **)slf_frame.data;
1866
1867 prepare_transfer (ta, arg [0], arg [1]);
1868}
1869
1870static void
1871slf_init_transfer (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1872{
1873 if (items != 2)
1874 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d,", items);
1875
1876 frame->prepare = slf_prepare_transfer;
1877 frame->check = slf_check_nop;
1878 frame->data = (void *)arg; /* let's hope it will stay valid */
1879}
1880
1881static void
1882slf_init_schedule (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1883{
1884 frame->prepare = prepare_schedule;
1885 frame->check = slf_check_nop;
1886}
1887
1888static void
1889slf_init_cede (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1890{
1891 frame->prepare = prepare_cede;
1892 frame->check = slf_check_nop;
1893}
1894
1895static void
1896slf_init_cede_notself (pTHX_ struct CoroSLF *frame, SV **arg, int items)
1897{
1898 frame->prepare = prepare_cede_notself;
1899 frame->check = slf_check_nop;
1900}
1901
1902/* we hijack an hopefully unused CV flag for our purposes */
1903#define CVf_SLF 0x4000
1904
1905/*
1906 * these not obviously related functions are all rolled into one
1907 * function to increase chances that they all will call transfer with the same
1908 * stack offset
1909 * SLF stands for "schedule-like-function".
1910 */
1911static OP *
1912pp_slf (pTHX)
1913{
1914 I32 checkmark; /* mark SP to see how many elements check has pushed */
1915
1916 /* set up the slf frame, unless it has already been set-up */
1917 /* the latter happens when a new coro has been started */
1918 /* or when a new cctx was attached to an existing coroutine */
1919 if (expect_true (!slf_frame.prepare))
1920 {
1921 /* first iteration */
1922 dSP;
1923 SV **arg = PL_stack_base + TOPMARK + 1;
1924 int items = SP - arg; /* args without function object */
1925 SV *gv = *sp;
1926
1927 /* do a quick consistency check on the "function" object, and if it isn't */
1928 /* for us, divert to the real entersub */
1929 if (SvTYPE (gv) != SVt_PVGV || !(CvFLAGS (GvCV (gv)) & CVf_SLF))
1930 return PL_ppaddr[OP_ENTERSUB](aTHX);
1931
1932 /* pop args */
1933 SP = PL_stack_base + POPMARK;
1934
1935 if (!(PL_op->op_flags & OPf_STACKED))
1936 {
1937 /* ampersand-form of call, use @_ instead of stack */
1938 AV *av = GvAV (PL_defgv);
1939 arg = AvARRAY (av);
1940 items = AvFILLp (av) + 1;
1941 }
1942
1943 PUTBACK;
1944
1945 ((coro_slf_cb)CvXSUBANY (GvCV (gv)).any_ptr) (aTHX_ &slf_frame, arg, items);
1946 }
1947
1948 /* now interpret the slf_frame */
1949 /* we use a callback system not to make the code needlessly */
1950 /* complicated, but so we can run multiple perl coros from one cctx */
1951
1952 do
1953 {
1954 struct coro_transfer_args ta;
1955
1956 slf_frame.prepare (aTHX_ &ta);
1957 TRANSFER (ta, 0);
1958
1959 checkmark = PL_stack_sp - PL_stack_base;
1960 }
1961 while (slf_frame.check (aTHX_ &slf_frame));
1962
1963 {
1964 dSP;
1965 SV **bot = PL_stack_base + checkmark;
1966 int gimme = GIMME_V;
1967
1968 slf_frame.prepare = 0; /* signal pp_slf that we need a new frame */
1969
1970 /* make sure we put something on the stack in scalar context */
1971 if (gimme == G_SCALAR)
1972 {
1973 if (sp == bot)
1974 XPUSHs (&PL_sv_undef);
1975
1976 SP = bot + 1;
1977 }
1978
1979 PUTBACK;
1980 }
1981
1982 return NORMAL;
1983}
1984
1985static void
1986api_execute_slf (pTHX_ CV *cv, coro_slf_cb init_cb, SV **arg, int items)
1987{
1988 assert (("FATAL: SLF call with illegal CV value", !CvANON (cv)));
1989
1990 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB]
1991 && PL_op->op_ppaddr != pp_slf)
1992 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught");
1993
1994 if (items > 3)
1995 croak ("Coro only supports up to three arguments to SLF functions currently (not %d), caught", items);
1996
1997 CvFLAGS (cv) |= CVf_SLF;
1998 CvXSUBANY (cv).any_ptr = (void *)init_cb;
1999 slf_cv = cv;
2000
2001 /* we patch the op, and then re-run the whole call */
2002 /* we have to put the same argument on the stack for this to work */
2003 /* and this will be done by pp_restore */
2004 slf_restore.op_next = (OP *)&slf_restore;
2005 slf_restore.op_type = OP_NULL;
2006 slf_restore.op_ppaddr = pp_restore;
2007 slf_restore.op_first = PL_op;
2008
2009 slf_arg0 = items > 0 ? SvREFCNT_inc (arg [0]) : 0;
2010 slf_arg1 = items > 1 ? SvREFCNT_inc (arg [1]) : 0;
2011 slf_arg2 = items > 2 ? SvREFCNT_inc (arg [2]) : 0;
2012
2013 PL_op->op_ppaddr = pp_slf;
2014
2015 PL_op = (OP *)&slf_restore;
2016}
2017
2018/*****************************************************************************/
2019
2020static int
2021slf_check_semaphore_down (pTHX_ struct CoroSLF *frame)
2022{
2023 AV *av = (AV *)frame->data;
2024 SV *count_sv = AvARRAY (av)[0];
2025
2026 if (SvIVX (count_sv) > 0)
2027 {
2028 SvIVX (count_sv) = SvIVX (count_sv) - 1;
2029 return 0;
2030 }
2031 else
2032 {
2033 int i;
2034 /* if we were woken up but can't down, we look through the whole */
2035 /* waiters list and only add us if we aren't in there already */
2036 /* this avoids some degenerate memory usage cases */
2037
2038 for (i = 1; i <= AvFILLp (av); ++i)
2039 if (AvARRAY (av)[i] == SvRV (coro_current))
2040 return 1;
2041
2042 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2043 return 1;
2044 }
2045}
2046
2047static void
2048slf_init_semaphore_down (pTHX_ struct CoroSLF *frame, SV **arg, int items)
2049{
2050 AV *av = (AV *)SvRV (arg [0]);
2051
2052 if (SvIVX (AvARRAY (av)[0]) > 0)
2053 {
2054 frame->data = (void *)av;
2055 frame->prepare = prepare_nop;
2056 }
2057 else
2058 {
2059 av_push (av, SvREFCNT_inc (SvRV (coro_current)));
2060
2061 frame->data = (void *)sv_2mortal (SvREFCNT_inc ((SV *)av));
2062 frame->prepare = prepare_schedule;
2063 }
2064
2065 frame->check = slf_check_semaphore_down;
2066
2067}
2068
1497MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2069MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1498 2070
1499PROTOTYPES: DISABLE 2071PROTOTYPES: DISABLE
1500 2072
1501BOOT: 2073BOOT:
1502{ 2074{
1503#ifdef USE_ITHREADS 2075#ifdef USE_ITHREADS
1504 MUTEX_INIT (&coro_mutex); 2076 MUTEX_INIT (&coro_lock);
2077# if CORO_PTHREAD
2078 coro_thx = PERL_GET_CONTEXT;
2079# endif
1505#endif 2080#endif
1506 BOOT_PAGESIZE; 2081 BOOT_PAGESIZE;
1507 2082
1508 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2083 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1509 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2084 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1510 2085
2086 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2087 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2088 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
2089
1511 hv_sig = coro_get_hv ("SIG", TRUE); 2090 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1512 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 2091 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1513 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 2092 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1514
1515 if (!PL_diehook ) hv_store (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, SvREFCNT_inc (sv_diehook ), 0);
1516 if (!PL_warnhook) hv_store (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, SvREFCNT_inc (sv_warnhook), 0);
1517 2093
1518 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 2094 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1519 2095
1520 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 2096 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1521 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 2097 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1526 main_top_env = PL_top_env; 2102 main_top_env = PL_top_env;
1527 2103
1528 while (main_top_env->je_prev) 2104 while (main_top_env->je_prev)
1529 main_top_env = main_top_env->je_prev; 2105 main_top_env = main_top_env->je_prev;
1530 2106
1531 coroapi.ver = CORO_API_VERSION; 2107 coroapi.ver = CORO_API_VERSION;
1532 coroapi.rev = CORO_API_REVISION; 2108 coroapi.rev = CORO_API_REVISION;
2109
1533 coroapi.transfer = api_transfer; 2110 coroapi.transfer = api_transfer;
2111
2112 coroapi.sv_state = SvSTATE_;
2113 coroapi.execute_slf = api_execute_slf;
2114 coroapi.prepare_nop = prepare_nop;
2115 coroapi.prepare_schedule = prepare_schedule;
2116 coroapi.prepare_cede = prepare_cede;
2117 coroapi.prepare_cede_notself = prepare_cede_notself;
2118
2119 {
2120 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2121
2122 if (!svp) croak ("Time::HiRes is required");
2123 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2124
2125 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2126 }
1534 2127
1535 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2128 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1536} 2129}
1537 2130
1538SV * 2131SV *
1539new (char *klass, ...) 2132new (char *klass, ...)
1540 CODE: 2133 CODE:
1541{ 2134{
1542 struct coro *coro; 2135 struct coro *coro;
2136 MAGIC *mg;
1543 HV *hv; 2137 HV *hv;
1544 int i; 2138 int i;
1545 2139
1546 Newz (0, coro, 1, struct coro); 2140 Newz (0, coro, 1, struct coro);
1547 coro->args = newAV (); 2141 coro->args = newAV ();
… …
1550 if (coro_first) coro_first->prev = coro; 2144 if (coro_first) coro_first->prev = coro;
1551 coro->next = coro_first; 2145 coro->next = coro_first;
1552 coro_first = coro; 2146 coro_first = coro;
1553 2147
1554 coro->hv = hv = newHV (); 2148 coro->hv = hv = newHV ();
1555 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 2149 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2150 mg->mg_flags |= MGf_DUP;
1556 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2151 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1557 2152
1558 av_extend (coro->args, items - 1); 2153 av_extend (coro->args, items - 1);
1559 for (i = 1; i < items; i++) 2154 for (i = 1; i < items; i++)
1560 av_push (coro->args, newSVsv (ST (i))); 2155 av_push (coro->args, newSVsv (ST (i)));
1561} 2156}
1562 OUTPUT: 2157 OUTPUT:
1563 RETVAL 2158 RETVAL
1564 2159
1565# these not obviously related functions are all rolled into the same xs
1566# function to increase chances that they all will call transfer with the same
1567# stack offset
1568void 2160void
1569_set_stacklevel (...) 2161_set_stacklevel (...)
1570 ALIAS: 2162 CODE:
1571 Coro::State::transfer = 1 2163 api_execute_slf (aTHX_ cv, slf_init_set_stacklevel, &ST (0), items);
1572 Coro::schedule = 2
1573 Coro::cede = 3
1574 Coro::cede_notself = 4
1575 CODE:
1576{
1577 struct transfer_args ta;
1578 2164
1579 switch (ix) 2165void
1580 { 2166transfer (...)
1581 case 0: 2167 PROTOTYPE: $$
1582 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 2168 CODE:
1583 ta.next = 0; 2169 api_execute_slf (aTHX_ cv, slf_init_transfer, &ST (0), items);
1584 break;
1585
1586 case 1:
1587 if (items != 2)
1588 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1589
1590 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1591 break;
1592
1593 case 2:
1594 prepare_schedule (aTHX_ &ta);
1595 break;
1596
1597 case 3:
1598 prepare_cede (aTHX_ &ta);
1599 break;
1600
1601 case 4:
1602 if (!prepare_cede_notself (aTHX_ &ta))
1603 XSRETURN_EMPTY;
1604
1605 break;
1606 }
1607
1608 BARRIER;
1609 PUTBACK;
1610 TRANSFER (ta);
1611 SPAGAIN; /* might be the sp of a different coroutine now */
1612 /* be extra careful not to ever do anything after TRANSFER */
1613}
1614 2170
1615bool 2171bool
1616_destroy (SV *coro_sv) 2172_destroy (SV *coro_sv)
1617 CODE: 2173 CODE:
1618 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 2174 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1619 OUTPUT: 2175 OUTPUT:
1620 RETVAL 2176 RETVAL
1621 2177
1622void 2178void
1623_exit (code) 2179_exit (int code)
1624 int code
1625 PROTOTYPE: $ 2180 PROTOTYPE: $
1626 CODE: 2181 CODE:
1627 _exit (code); 2182 _exit (code);
1628 2183
1629int 2184int
1630cctx_stacksize (int new_stacksize = 0) 2185cctx_stacksize (int new_stacksize = 0)
2186 PROTOTYPE: ;$
1631 CODE: 2187 CODE:
1632 RETVAL = coro_stacksize; 2188 RETVAL = cctx_stacksize;
1633 if (new_stacksize) 2189 if (new_stacksize)
2190 {
1634 coro_stacksize = new_stacksize; 2191 cctx_stacksize = new_stacksize;
2192 ++cctx_gen;
2193 }
1635 OUTPUT: 2194 OUTPUT:
1636 RETVAL 2195 RETVAL
1637 2196
1638int 2197int
2198cctx_max_idle (int max_idle = 0)
2199 PROTOTYPE: ;$
2200 CODE:
2201 RETVAL = cctx_max_idle;
2202 if (max_idle > 1)
2203 cctx_max_idle = max_idle;
2204 OUTPUT:
2205 RETVAL
2206
2207int
1639cctx_count () 2208cctx_count ()
2209 PROTOTYPE:
1640 CODE: 2210 CODE:
1641 RETVAL = cctx_count; 2211 RETVAL = cctx_count;
1642 OUTPUT: 2212 OUTPUT:
1643 RETVAL 2213 RETVAL
1644 2214
1645int 2215int
1646cctx_idle () 2216cctx_idle ()
2217 PROTOTYPE:
1647 CODE: 2218 CODE:
1648 RETVAL = cctx_idle; 2219 RETVAL = cctx_idle;
1649 OUTPUT: 2220 OUTPUT:
1650 RETVAL 2221 RETVAL
1651 2222
1652void 2223void
1653list () 2224list ()
2225 PROTOTYPE:
1654 PPCODE: 2226 PPCODE:
1655{ 2227{
1656 struct coro *coro; 2228 struct coro *coro;
1657 for (coro = coro_first; coro; coro = coro->next) 2229 for (coro = coro_first; coro; coro = coro->next)
1658 if (coro->hv) 2230 if (coro->hv)
… …
1663call (Coro::State coro, SV *coderef) 2235call (Coro::State coro, SV *coderef)
1664 ALIAS: 2236 ALIAS:
1665 eval = 1 2237 eval = 1
1666 CODE: 2238 CODE:
1667{ 2239{
1668 if (coro->mainstack) 2240 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1669 { 2241 {
1670 struct coro temp; 2242 struct coro temp;
1671 2243
1672 if (!(coro->flags & CF_RUNNING)) 2244 if (!(coro->flags & CF_RUNNING))
1673 { 2245 {
2246 PUTBACK;
1674 save_perl (aTHX_ &temp); 2247 save_perl (aTHX_ &temp);
1675 load_perl (aTHX_ coro); 2248 load_perl (aTHX_ coro);
1676 } 2249 }
1677 2250
1678 { 2251 {
… …
1697 2270
1698 if (!(coro->flags & CF_RUNNING)) 2271 if (!(coro->flags & CF_RUNNING))
1699 { 2272 {
1700 save_perl (aTHX_ coro); 2273 save_perl (aTHX_ coro);
1701 load_perl (aTHX_ &temp); 2274 load_perl (aTHX_ &temp);
2275 SPAGAIN;
1702 } 2276 }
1703 } 2277 }
1704} 2278}
1705 2279
1706SV * 2280SV *
… …
1715 RETVAL = boolSV (coro->flags & ix); 2289 RETVAL = boolSV (coro->flags & ix);
1716 OUTPUT: 2290 OUTPUT:
1717 RETVAL 2291 RETVAL
1718 2292
1719void 2293void
2294throw (Coro::State self, SV *throw = &PL_sv_undef)
2295 PROTOTYPE: $;$
2296 CODE:
2297 SvREFCNT_dec (self->throw);
2298 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2299
2300void
1720api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2301api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2302 PROTOTYPE: $;$
2303 C_ARGS: aTHX_ coro, flags
1721 2304
1722SV * 2305SV *
1723has_stack (Coro::State coro) 2306has_cctx (Coro::State coro)
1724 PROTOTYPE: $ 2307 PROTOTYPE: $
1725 CODE: 2308 CODE:
1726 RETVAL = boolSV (!!coro->cctx); 2309 RETVAL = boolSV (!!coro->cctx);
1727 OUTPUT: 2310 OUTPUT:
1728 RETVAL 2311 RETVAL
… …
1733 CODE: 2316 CODE:
1734 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2317 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1735 OUTPUT: 2318 OUTPUT:
1736 RETVAL 2319 RETVAL
1737 2320
1738IV 2321UV
1739rss (Coro::State coro) 2322rss (Coro::State coro)
1740 PROTOTYPE: $ 2323 PROTOTYPE: $
1741 ALIAS: 2324 ALIAS:
1742 usecount = 1 2325 usecount = 1
1743 CODE: 2326 CODE:
… …
1747 case 1: RETVAL = coro->usecount; break; 2330 case 1: RETVAL = coro->usecount; break;
1748 } 2331 }
1749 OUTPUT: 2332 OUTPUT:
1750 RETVAL 2333 RETVAL
1751 2334
2335void
2336force_cctx ()
2337 PROTOTYPE:
2338 CODE:
2339 struct coro *coro = SvSTATE (coro_current);
2340 coro->cctx->idle_sp = 0;
2341
2342void
2343swap_defsv (Coro::State self)
2344 PROTOTYPE: $
2345 ALIAS:
2346 swap_defav = 1
2347 CODE:
2348 if (!self->slot)
2349 croak ("cannot swap state with coroutine that has no saved state,");
2350 else
2351 {
2352 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2353 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2354
2355 SV *tmp = *src; *src = *dst; *dst = tmp;
2356 }
1752 2357
1753MODULE = Coro::State PACKAGE = Coro 2358MODULE = Coro::State PACKAGE = Coro
1754 2359
1755BOOT: 2360BOOT:
1756{ 2361{
1757 int i; 2362 int i;
1758 2363
1759 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1760 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1761 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 2364 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2365 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2366 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1762 2367
1763 coro_current = coro_get_sv ("Coro::current", FALSE); 2368 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1764 SvREADONLY_on (coro_current); 2369 SvREADONLY_on (coro_current);
1765 2370
1766 coro_stash = gv_stashpv ("Coro", TRUE); 2371 coro_stash = gv_stashpv ("Coro", TRUE);
1767 2372
1768 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 2373 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1774 2379
1775 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2380 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1776 coro_ready[i] = newAV (); 2381 coro_ready[i] = newAV ();
1777 2382
1778 { 2383 {
1779 SV *sv = perl_get_sv ("Coro::API", TRUE); 2384 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
1780 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1781 2385
1782 coroapi.schedule = api_schedule; 2386 coroapi.schedule = api_schedule;
1783 coroapi.cede = api_cede; 2387 coroapi.cede = api_cede;
1784 coroapi.cede_notself = api_cede_notself; 2388 coroapi.cede_notself = api_cede_notself;
1785 coroapi.ready = api_ready; 2389 coroapi.ready = api_ready;
1786 coroapi.is_ready = api_is_ready; 2390 coroapi.is_ready = api_is_ready;
1787 coroapi.nready = &coro_nready; 2391 coroapi.nready = coro_nready;
1788 coroapi.current = coro_current; 2392 coroapi.current = coro_current;
1789 2393
1790 GCoroAPI = &coroapi; 2394 GCoroAPI = &coroapi;
1791 sv_setiv (sv, (IV)&coroapi); 2395 sv_setiv (sv, (IV)&coroapi);
1792 SvREADONLY_on (sv); 2396 SvREADONLY_on (sv);
1793 } 2397 }
1794} 2398}
2399
2400void
2401schedule (...)
2402 CODE:
2403 api_execute_slf (aTHX_ cv, slf_init_schedule, &ST (0), 0);
2404
2405void
2406cede (...)
2407 CODE:
2408 api_execute_slf (aTHX_ cv, slf_init_cede, &ST (0), 0);
2409
2410void
2411cede_notself (...)
2412 CODE:
2413 api_execute_slf (aTHX_ cv, slf_init_cede_notself, &ST (0), 0);
1795 2414
1796void 2415void
1797_set_current (SV *current) 2416_set_current (SV *current)
1798 PROTOTYPE: $ 2417 PROTOTYPE: $
1799 CODE: 2418 CODE:
1800 SvREFCNT_dec (SvRV (coro_current)); 2419 SvREFCNT_dec (SvRV (coro_current));
1801 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 2420 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
2421
2422void
2423_set_readyhook (SV *hook)
2424 PROTOTYPE: $
2425 CODE:
2426 LOCK;
2427 SvREFCNT_dec (coro_readyhook);
2428 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
2429 UNLOCK;
1802 2430
1803int 2431int
1804prio (Coro::State coro, int newprio = 0) 2432prio (Coro::State coro, int newprio = 0)
2433 PROTOTYPE: $;$
1805 ALIAS: 2434 ALIAS:
1806 nice = 1 2435 nice = 1
1807 CODE: 2436 CODE:
1808{ 2437{
1809 RETVAL = coro->prio; 2438 RETVAL = coro->prio;
… …
1824 2453
1825SV * 2454SV *
1826ready (SV *self) 2455ready (SV *self)
1827 PROTOTYPE: $ 2456 PROTOTYPE: $
1828 CODE: 2457 CODE:
1829 RETVAL = boolSV (api_ready (self)); 2458 RETVAL = boolSV (api_ready (aTHX_ self));
1830 OUTPUT: 2459 OUTPUT:
1831 RETVAL 2460 RETVAL
1832 2461
1833int 2462int
1834nready (...) 2463nready (...)
… …
1836 CODE: 2465 CODE:
1837 RETVAL = coro_nready; 2466 RETVAL = coro_nready;
1838 OUTPUT: 2467 OUTPUT:
1839 RETVAL 2468 RETVAL
1840 2469
1841void
1842throw (Coro::State self, SV *throw = &PL_sv_undef)
1843 PROTOTYPE: $;$
1844 CODE:
1845 SvREFCNT_dec (self->throw);
1846 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1847
1848# for async_pool speedup 2470# for async_pool speedup
1849void 2471void
1850_pool_1 (SV *cb) 2472_pool_1 (SV *cb)
1851 CODE: 2473 CODE:
1852{ 2474{
… …
1856 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 2478 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1857 AV *invoke_av; 2479 AV *invoke_av;
1858 int i, len; 2480 int i, len;
1859 2481
1860 if (!invoke) 2482 if (!invoke)
2483 {
2484 SV *old = PL_diehook;
2485 PL_diehook = 0;
2486 SvREFCNT_dec (old);
1861 croak ("\3async_pool terminate\2\n"); 2487 croak ("\3async_pool terminate\2\n");
2488 }
1862 2489
1863 SvREFCNT_dec (coro->saved_deffh); 2490 SvREFCNT_dec (coro->saved_deffh);
1864 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2491 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1865 2492
1866 hv_store (hv, "desc", sizeof ("desc") - 1, 2493 hv_store (hv, "desc", sizeof ("desc") - 1,
1867 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2494 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1868 2495
1869 invoke_av = (AV *)SvRV (invoke); 2496 invoke_av = (AV *)SvRV (invoke);
… …
1873 2500
1874 if (len > 0) 2501 if (len > 0)
1875 { 2502 {
1876 av_fill (defav, len - 1); 2503 av_fill (defav, len - 1);
1877 for (i = 0; i < len; ++i) 2504 for (i = 0; i < len; ++i)
1878 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2505 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
1879 } 2506 }
1880
1881 SvREFCNT_dec (invoke);
1882} 2507}
1883 2508
1884void 2509void
1885_pool_2 (SV *cb) 2510_pool_2 (SV *cb)
1886 CODE: 2511 CODE:
… …
1890 sv_setsv (cb, &PL_sv_undef); 2515 sv_setsv (cb, &PL_sv_undef);
1891 2516
1892 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2517 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1893 coro->saved_deffh = 0; 2518 coro->saved_deffh = 0;
1894 2519
1895 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2520 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1896 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2521 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2522 {
2523 SV *old = PL_diehook;
2524 PL_diehook = 0;
2525 SvREFCNT_dec (old);
1897 croak ("\3async_pool terminate\2\n"); 2526 croak ("\3async_pool terminate\2\n");
2527 }
1898 2528
1899 av_clear (GvAV (PL_defgv)); 2529 av_clear (GvAV (PL_defgv));
1900 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2530 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1901 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2531 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1902 2532
1903 coro->prio = 0; 2533 coro->prio = 0;
1904 2534
1905 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2535 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1906 api_trace (coro_current, 0); 2536 api_trace (aTHX_ coro_current, 0);
1907 2537
1908 av_push (av_async_pool, newSVsv (coro_current)); 2538 av_push (av_async_pool, newSVsv (coro_current));
1909} 2539}
1910 2540
2541#if 0
2542
2543void
2544_generator_call (...)
2545 PROTOTYPE: @
2546 PPCODE:
2547 fprintf (stderr, "call %p\n", CvXSUBANY(cv).any_ptr);
2548 xxxx
2549 abort ();
2550
2551SV *
2552gensub (SV *sub, ...)
2553 PROTOTYPE: &;@
2554 CODE:
2555{
2556 struct coro *coro;
2557 MAGIC *mg;
2558 CV *xcv;
2559 CV *ncv = (CV *)newSV_type (SVt_PVCV);
2560 int i;
2561
2562 CvGV (ncv) = CvGV (cv);
2563 CvFILE (ncv) = CvFILE (cv);
2564
2565 Newz (0, coro, 1, struct coro);
2566 coro->args = newAV ();
2567 coro->flags = CF_NEW;
2568
2569 av_extend (coro->args, items - 1);
2570 for (i = 1; i < items; i++)
2571 av_push (coro->args, newSVsv (ST (i)));
2572
2573 CvISXSUB_on (ncv);
2574 CvXSUBANY (ncv).any_ptr = (void *)coro;
2575
2576 xcv = GvCV (gv_fetchpv ("Coro::_generator_call", 0, SVt_PVCV));
2577
2578 CvXSUB (ncv) = CvXSUB (xcv);
2579 CvANON_on (ncv);
2580
2581 mg = sv_magicext ((SV *)ncv, 0, CORO_MAGIC_type_state, &coro_gensub_vtbl, (char *)coro, 0);
2582 RETVAL = newRV_noinc ((SV *)ncv);
2583}
2584 OUTPUT:
2585 RETVAL
2586
2587#endif
2588
1911 2589
1912MODULE = Coro::State PACKAGE = Coro::AIO 2590MODULE = Coro::State PACKAGE = Coro::AIO
1913 2591
1914SV * 2592void
1915_get_state () 2593_get_state (SV *self)
2594 PROTOTYPE: $
1916 CODE: 2595 PPCODE:
1917{ 2596{
1918 struct io_state *data; 2597 AV *defav = GvAV (PL_defgv);
1919 2598 AV *av = newAV ();
2599 int i;
1920 RETVAL = newSV (sizeof (struct io_state)); 2600 SV *data_sv = newSV (sizeof (struct io_state));
1921 data = (struct io_state *)SvPVX (RETVAL); 2601 struct io_state *data = (struct io_state *)SvPVX (data_sv);
1922 SvCUR_set (RETVAL, sizeof (struct io_state)); 2602 SvCUR_set (data_sv, sizeof (struct io_state));
1923 SvPOK_only (RETVAL); 2603 SvPOK_only (data_sv);
1924 2604
1925 data->errorno = errno; 2605 data->errorno = errno;
1926 data->laststype = PL_laststype; 2606 data->laststype = PL_laststype;
1927 data->laststatval = PL_laststatval; 2607 data->laststatval = PL_laststatval;
1928 data->statcache = PL_statcache; 2608 data->statcache = PL_statcache;
2609
2610 av_extend (av, AvFILLp (defav) + 1 + 1);
2611
2612 for (i = 0; i <= AvFILLp (defav); ++i)
2613 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i]));
2614
2615 av_push (av, data_sv);
2616
2617 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2618
2619 api_ready (aTHX_ self);
1929} 2620}
1930 OUTPUT:
1931 RETVAL
1932 2621
1933void 2622void
1934_set_state (char *data_) 2623_set_state (SV *state)
1935 PROTOTYPE: $ 2624 PROTOTYPE: $
1936 CODE: 2625 PPCODE:
1937{ 2626{
1938 struct io_state *data = (void *)data_; 2627 AV *av = (AV *)SvRV (state);
2628 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]);
2629 int i;
1939 2630
1940 errno = data->errorno; 2631 errno = data->errorno;
1941 PL_laststype = data->laststype; 2632 PL_laststype = data->laststype;
1942 PL_laststatval = data->laststatval; 2633 PL_laststatval = data->laststatval;
1943 PL_statcache = data->statcache; 2634 PL_statcache = data->statcache;
1944}
1945 2635
2636 EXTEND (SP, AvFILLp (av));
2637 for (i = 0; i < AvFILLp (av); ++i)
2638 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2639}
2640
2641
2642MODULE = Coro::State PACKAGE = Coro::AnyEvent
2643
2644BOOT:
2645 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2646
2647SV *
2648_schedule (...)
2649 CODE:
2650{
2651 static int incede;
2652
2653 api_cede_notself (aTHX);
2654
2655 ++incede;
2656 while (coro_nready >= incede && api_cede (aTHX))
2657 ;
2658
2659 sv_setsv (sv_activity, &PL_sv_undef);
2660 if (coro_nready >= incede)
2661 {
2662 PUSHMARK (SP);
2663 PUTBACK;
2664 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2665 SPAGAIN;
2666 }
2667
2668 --incede;
2669}
2670
2671
2672MODULE = Coro::State PACKAGE = PerlIO::cede
2673
2674BOOT:
2675 PerlIO_define_layer (aTHX_ &PerlIO_cede);
2676
2677MODULE = Coro::State PACKAGE = Coro::Semaphore
2678
2679SV *
2680new (SV *klass, SV *count_ = 0)
2681 CODE:
2682{
2683 /* a semaphore contains a counter IV in $sem->[0] and any waiters after that */
2684 AV *av = newAV ();
2685 av_push (av, newSViv (count_ && SvOK (count_) ? SvIV (count_) : 1));
2686 RETVAL = sv_bless (newRV_noinc ((SV *)av), GvSTASH (CvGV (cv)));
2687}
2688 OUTPUT:
2689 RETVAL
2690
2691SV *
2692count (SV *self)
2693 CODE:
2694 RETVAL = newSVsv (AvARRAY ((AV *)SvRV (self))[0]);
2695 OUTPUT:
2696 RETVAL
2697
2698void
2699up (SV *self, int adjust = 1)
2700 ALIAS:
2701 adjust = 1
2702 CODE:
2703{
2704 AV *av = (AV *)SvRV (self);
2705 SV *count_sv = AvARRAY (av)[0];
2706 IV count = SvIVX (count_sv);
2707
2708 count += ix ? adjust : 1;
2709 SvIVX (count_sv) = count;
2710
2711 /* now wake up as many waiters as possible */
2712 while (count > 0 && AvFILLp (av) >= count)
2713 {
2714 SV *cb;
2715
2716 /* swap first two elements so we can shift a waiter */
2717 AvARRAY (av)[0] = AvARRAY (av)[1];
2718 AvARRAY (av)[1] = count_sv;
2719 cb = av_shift (av);
2720
2721 if (SvOBJECT (cb))
2722 api_ready (cb);
2723 else
2724 croak ("callbacks not yet supported");
2725
2726 SvREFCNT_dec (cb);
2727 }
2728}
2729
2730void
2731down (SV *self)
2732 CODE:
2733 api_execute_slf (aTHX_ cv, slf_init_semaphore_down, &ST (0), 1);
2734
2735void
2736try (SV *self)
2737 PPCODE:
2738{
2739 AV *av = (AV *)SvRV (self);
2740 SV *count_sv = AvARRAY (av)[0];
2741 IV count = SvIVX (count_sv);
2742
2743 if (count > 0)
2744 {
2745 --count;
2746 SvIVX (count_sv) = count;
2747 XSRETURN_YES;
2748 }
2749 else
2750 XSRETURN_NO;
2751}
2752
2753void
2754waiters (SV *self)
2755 CODE:
2756{
2757 AV *av = (AV *)SvRV (self);
2758
2759 if (GIMME_V == G_SCALAR)
2760 XPUSHs (sv_2mortal (newSVsv (AvARRAY (av)[0])));
2761 else
2762 {
2763 int i;
2764 EXTEND (SP, AvFILLp (av) + 1 - 1);
2765 for (i = 1; i <= AvFILLp (av); ++i)
2766 PUSHs (newSVsv (AvARRAY (av)[i]));
2767 }
2768}
2769

Diff Legend

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