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.210 by root, Wed Oct 10 03:24:40 2007 UTC vs.
Revision 1.274 by root, Sat Nov 15 00:08:30 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
134#endif
135 159
136#define strpair(const) const, sizeof (const) - 1 160#endif
161
162# undef LOCK
163# define LOCK (void)0
164# undef UNLOCK
165# define UNLOCK (void)0
137 166
138/* helper storage struct for Coro::AIO */ 167/* helper storage struct for Coro::AIO */
139struct io_state 168struct io_state
140{ 169{
170 AV *res;
141 int errorno; 171 int errorno;
142 I32 laststype; 172 I32 laststype; /* U16 in 5.10.0 */
143 int laststatval; 173 int laststatval;
144 Stat_t statcache; 174 Stat_t statcache;
145}; 175};
146 176
177static double (*nvtime)(); /* so why doesn't it take void? */
178
179static U32 cctx_gen;
147static size_t coro_stacksize = CORO_STACKSIZE; 180static size_t cctx_stacksize = CORO_STACKSIZE;
148static struct CoroAPI coroapi; 181static struct CoroAPI coroapi;
149static AV *main_mainstack; /* used to differentiate between $main and others */ 182static AV *main_mainstack; /* used to differentiate between $main and others */
150static JMPENV *main_top_env; 183static JMPENV *main_top_env;
151static HV *coro_state_stash, *coro_stash; 184static HV *coro_state_stash, *coro_stash;
152static 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;
153 187
154static GV *irsgv; /* $/ */ 188static GV *irsgv; /* $/ */
155static GV *stdoutgv; /* *STDOUT */ 189static GV *stdoutgv; /* *STDOUT */
156 190static SV *rv_diehook;
191static SV *rv_warnhook;
157static HV *hv_sig; /* %SIG */ 192static HV *hv_sig; /* %SIG */
158static SV *sv_diehook;
159static SV *sv_warnhook;
160 193
161/* async_pool helper stuff */ 194/* async_pool helper stuff */
162static SV *sv_pool_rss; 195static SV *sv_pool_rss;
163static SV *sv_pool_size; 196static SV *sv_pool_size;
164static AV *av_async_pool; 197static AV *av_async_pool;
165 198
166static struct coro_cctx *cctx_first[3]; /* index by GIMME_V type, void, scalar, array */ 199/* Coro::AnyEvent */
200static SV *sv_activity;
201
202static struct coro_cctx *cctx_first;
167static int cctx_count, cctx_idle[3]; 203static int cctx_count, cctx_idle;
168 204
169enum { 205enum {
170 CC_MAPPED = 0x01, 206 CC_MAPPED = 0x01,
171 CC_NOREUSE = 0x02, /* throw this away after tracing */ 207 CC_NOREUSE = 0x02, /* throw this away after tracing */
172 CC_TRACE = 0x04, 208 CC_TRACE = 0x04,
… …
174 CC_TRACE_LINE = 0x10, /* trace each statement */ 210 CC_TRACE_LINE = 0x10, /* trace each statement */
175 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE, 211 CC_TRACE_ALL = CC_TRACE_SUB | CC_TRACE_LINE,
176}; 212};
177 213
178/* this is a structure representing a c-level coroutine */ 214/* this is a structure representing a c-level coroutine */
179typedef struct coro_cctx { 215typedef struct coro_cctx
216{
180 struct coro_cctx *next; 217 struct coro_cctx *next;
181 218
182 /* the stack */ 219 /* the stack */
183 void *sptr; 220 void *sptr;
184 size_t ssize; 221 size_t ssize;
… …
187 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 224 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
188 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 */
189 JMPENV *top_env; 226 JMPENV *top_env;
190 coro_context cctx; 227 coro_context cctx;
191 228
229 U32 gen;
192#if CORO_USE_VALGRIND 230#if CORO_USE_VALGRIND
193 int valgrind_id; 231 int valgrind_id;
194#endif 232#endif
195 unsigned char flags; 233 unsigned char flags;
196} coro_cctx; 234} coro_cctx;
… …
201 CF_NEW = 0x0004, /* has never been switched to */ 239 CF_NEW = 0x0004, /* has never been switched to */
202 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 240 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
203}; 241};
204 242
205/* 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 */
206typedef struct { 244typedef struct
245{
207 SV *defsv; 246 SV *defsv;
208 AV *defav; 247 AV *defav;
209 SV *errsv; 248 SV *errsv;
210 SV *irsgv; 249 SV *irsgv;
211#define VAR(name,type) type name; 250#define VAR(name,type) type name;
… …
215 254
216#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))
217 256
218/* this is a structure representing a perl-level coroutine */ 257/* this is a structure representing a perl-level coroutine */
219struct coro { 258struct coro {
220 /* the c coroutine allocated to this perl coroutine, if any */ 259 /* the C coroutine allocated to this perl coroutine, if any */
221 coro_cctx *cctx; 260 coro_cctx *cctx;
222 int gimme;
223 261
224 /* process data */ 262 /* process data */
263 struct CoroSLF slf_frame; /* saved slf frame */
225 AV *mainstack; 264 AV *mainstack;
226 perl_slots *slot; /* basically the saved sp */ 265 perl_slots *slot; /* basically the saved sp */
227 266
228 AV *args; /* data associated with this coroutine (initial args) */ 267 AV *args; /* data associated with this coroutine (initial args) */
229 int refcnt; /* coroutines are refcounted, yes */ 268 int refcnt; /* coroutines are refcounted, yes */
… …
244 struct coro *next, *prev; 283 struct coro *next, *prev;
245}; 284};
246 285
247typedef struct coro *Coro__State; 286typedef struct coro *Coro__State;
248typedef struct coro *Coro__State_or_hashref; 287typedef struct coro *Coro__State_or_hashref;
288
289static struct CoroSLF slf_frame; /* the current slf frame */
249 290
250/** Coro ********************************************************************/ 291/** Coro ********************************************************************/
251 292
252#define PRIO_MAX 3 293#define PRIO_MAX 3
253#define PRIO_HIGH 1 294#define PRIO_HIGH 1
… …
256#define PRIO_IDLE -3 297#define PRIO_IDLE -3
257#define PRIO_MIN -4 298#define PRIO_MIN -4
258 299
259/* for Coro.pm */ 300/* for Coro.pm */
260static SV *coro_current; 301static SV *coro_current;
302static SV *coro_readyhook;
261static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 303static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
262static int coro_nready;
263static struct coro *coro_first; 304static struct coro *coro_first;
305#define coro_nready coroapi.nready
264 306
265/** lowlevel stuff **********************************************************/ 307/** lowlevel stuff **********************************************************/
266 308
267static SV * 309static SV *
268coro_get_sv (const char *name, int create) 310coro_get_sv (pTHX_ const char *name, int create)
269{ 311{
270#if PERL_VERSION_ATLEAST (5,9,0) 312#if PERL_VERSION_ATLEAST (5,10,0)
271 /* 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 */
272 get_sv (name, create); 314 get_sv (name, create);
273#endif 315#endif
274 return get_sv (name, create); 316 return get_sv (name, create);
275} 317}
276 318
277static AV * 319static AV *
278coro_get_av (const char *name, int create) 320coro_get_av (pTHX_ const char *name, int create)
279{ 321{
280#if PERL_VERSION_ATLEAST (5,9,0) 322#if PERL_VERSION_ATLEAST (5,10,0)
281 /* 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 */
282 get_av (name, create); 324 get_av (name, create);
283#endif 325#endif
284 return get_av (name, create); 326 return get_av (name, create);
285} 327}
286 328
287static HV * 329static HV *
288coro_get_hv (const char *name, int create) 330coro_get_hv (pTHX_ const char *name, int create)
289{ 331{
290#if PERL_VERSION_ATLEAST (5,9,0) 332#if PERL_VERSION_ATLEAST (5,10,0)
291 /* 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 */
292 get_hv (name, create); 334 get_hv (name, create);
293#endif 335#endif
294 return get_hv (name, create); 336 return get_hv (name, create);
295} 337}
… …
300 AV *padlist = CvPADLIST (cv); 342 AV *padlist = CvPADLIST (cv);
301 AV *newpadlist, *newpad; 343 AV *newpadlist, *newpad;
302 344
303 newpadlist = newAV (); 345 newpadlist = newAV ();
304 AvREAL_off (newpadlist); 346 AvREAL_off (newpadlist);
305#if PERL_VERSION_ATLEAST (5,9,0) 347#if PERL_VERSION_ATLEAST (5,10,0)
306 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 348 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
307#else 349#else
308 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 350 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
309#endif 351#endif
310 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 352 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
311 --AvFILLp (padlist); 353 --AvFILLp (padlist);
312 354
313 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 355 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
314 av_store (newpadlist, 1, (SV *)newpad); 356 av_store (newpadlist, 1, (SV *)newpad);
315 357
316 return newpadlist; 358 return newpadlist;
317} 359}
318 360
… …
348 390
349 /* casting is fun. */ 391 /* casting is fun. */
350 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 392 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
351 free_padlist (aTHX_ padlist); 393 free_padlist (aTHX_ padlist);
352 394
353 SvREFCNT_dec (av); 395 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
354 396
355 return 0; 397 return 0;
356} 398}
357 399
358#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
359 402
360static 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};
361 407
362#define CORO_MAGIC(cv) \ 408#define CORO_MAGIC(sv, type) \
363 SvMAGIC (cv) \ 409 SvMAGIC (sv) \
364 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 410 ? SvMAGIC (sv)->mg_type == type \
365 ? SvMAGIC (cv) \ 411 ? SvMAGIC (sv) \
366 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 412 : mg_find (sv, type) \
367 : 0 413 : 0
368 414
369static 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 *
370SvSTATE_ (pTHX_ SV *coro) 419SvSTATE_ (pTHX_ SV *coro)
371{ 420{
372 HV *stash; 421 HV *stash;
373 MAGIC *mg; 422 MAGIC *mg;
374 423
… …
384 /* very slow, but rare, check */ 433 /* very slow, but rare, check */
385 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 434 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
386 croak ("Coro::State object required"); 435 croak ("Coro::State object required");
387 } 436 }
388 437
389 mg = CORO_MAGIC (coro); 438 mg = CORO_MAGIC_state (coro);
390 return (struct coro *)mg->mg_ptr; 439 return (struct coro *)mg->mg_ptr;
391} 440}
392 441
393#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 442#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
394 443
395/* the next two functions merely cache the padlists */ 444/* the next two functions merely cache the padlists */
396static void 445static void
397get_padlist (pTHX_ CV *cv) 446get_padlist (pTHX_ CV *cv)
398{ 447{
399 MAGIC *mg = CORO_MAGIC (cv); 448 MAGIC *mg = CORO_MAGIC_cv (cv);
400 AV *av; 449 AV *av;
401 450
402 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 451 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
403 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 452 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
404 else 453 else
405 { 454 {
406#if CORO_PREFER_PERL_FUNCTIONS 455#if CORO_PREFER_PERL_FUNCTIONS
407 /* this is probably cleaner, but also slower? */ 456 /* this is probably cleaner? but also slower! */
457 /* in practise, it seems to be less stable */
408 CV *cp = Perl_cv_clone (cv); 458 CV *cp = Perl_cv_clone (cv);
409 CvPADLIST (cv) = CvPADLIST (cp); 459 CvPADLIST (cv) = CvPADLIST (cp);
410 CvPADLIST (cp) = 0; 460 CvPADLIST (cp) = 0;
411 SvREFCNT_dec (cp); 461 SvREFCNT_dec (cp);
412#else 462#else
… …
416} 466}
417 467
418static void 468static void
419put_padlist (pTHX_ CV *cv) 469put_padlist (pTHX_ CV *cv)
420{ 470{
421 MAGIC *mg = CORO_MAGIC (cv); 471 MAGIC *mg = CORO_MAGIC_cv (cv);
422 AV *av; 472 AV *av;
423 473
424 if (expect_false (!mg)) 474 if (expect_false (!mg))
425 { 475 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
426 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
427 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
428 mg->mg_virtual = &vtbl_coro;
429 mg->mg_obj = (SV *)newAV ();
430 }
431 476
432 av = (AV *)mg->mg_obj; 477 av = (AV *)mg->mg_obj;
433 478
434 if (expect_false (AvFILLp (av) >= AvMAX (av))) 479 if (expect_false (AvFILLp (av) >= AvMAX (av)))
435 av_extend (av, AvMAX (av) + 1); 480 av_extend (av, AvMAX (av) + 1);
… …
453 GvSV (irsgv) = slot->irsgv; 498 GvSV (irsgv) = slot->irsgv;
454 499
455 #define VAR(name,type) PL_ ## name = slot->name; 500 #define VAR(name,type) PL_ ## name = slot->name;
456 # include "state.h" 501 # include "state.h"
457 #undef VAR 502 #undef VAR
458
459 /*hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);*/
460 /*hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);*/
461 503
462 { 504 {
463 dSP; 505 dSP;
464 506
465 CV *cv; 507 CV *cv;
… …
472 CvPADLIST (cv) = (AV *)POPs; 514 CvPADLIST (cv) = (AV *)POPs;
473 } 515 }
474 516
475 PUTBACK; 517 PUTBACK;
476 } 518 }
519
520 slf_frame = c->slf_frame;
477} 521}
478 522
479static void 523static void
480save_perl (pTHX_ Coro__State c) 524save_perl (pTHX_ Coro__State c)
481{ 525{
526 c->slf_frame = slf_frame;
527
482 { 528 {
483 dSP; 529 dSP;
484 I32 cxix = cxstack_ix; 530 I32 cxix = cxstack_ix;
485 PERL_CONTEXT *ccstk = cxstack; 531 PERL_CONTEXT *ccstk = cxstack;
486 PERL_SI *top_si = PL_curstackinfo; 532 PERL_SI *top_si = PL_curstackinfo;
… …
504 550
505 if (expect_true (CvDEPTH (cv))) 551 if (expect_true (CvDEPTH (cv)))
506 { 552 {
507 EXTEND (SP, 3); 553 EXTEND (SP, 3);
508 PUSHs ((SV *)CvPADLIST (cv)); 554 PUSHs ((SV *)CvPADLIST (cv));
509 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 555 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
510 PUSHs ((SV *)cv); 556 PUSHs ((SV *)cv);
511 557
512 CvDEPTH (cv) = 0; 558 CvDEPTH (cv) = 0;
513 get_padlist (aTHX_ cv); 559 get_padlist (aTHX_ cv);
514 } 560 }
… …
553 #undef VAR 599 #undef VAR
554 } 600 }
555} 601}
556 602
557/* 603/*
558 * allocate various perl stacks. This is an exact copy 604 * allocate various perl stacks. This is almost an exact copy
559 * of perl.c:init_stacks, except that it uses less memory 605 * of perl.c:init_stacks, except that it uses less memory
560 * on the (sometimes correct) assumption that coroutines do 606 * on the (sometimes correct) assumption that coroutines do
561 * not usually need a lot of stackspace. 607 * not usually need a lot of stackspace.
562 */ 608 */
563#if CORO_PREFER_PERL_FUNCTIONS 609#if CORO_PREFER_PERL_FUNCTIONS
… …
594 640
595 New(54,PL_savestack,24,ANY); 641 New(54,PL_savestack,24,ANY);
596 PL_savestack_ix = 0; 642 PL_savestack_ix = 0;
597 PL_savestack_max = 24; 643 PL_savestack_max = 24;
598 644
599#if !PERL_VERSION_ATLEAST (5,9,0) 645#if !PERL_VERSION_ATLEAST (5,10,0)
600 New(54,PL_retstack,4,OP*); 646 New(54,PL_retstack,4,OP*);
601 PL_retstack_ix = 0; 647 PL_retstack_ix = 0;
602 PL_retstack_max = 4; 648 PL_retstack_max = 4;
603#endif 649#endif
604} 650}
… …
606 652
607/* 653/*
608 * destroy the stacks, the callchain etc... 654 * destroy the stacks, the callchain etc...
609 */ 655 */
610static void 656static void
611coro_destroy_stacks (pTHX) 657coro_destruct_stacks (pTHX)
612{ 658{
613 while (PL_curstackinfo->si_next) 659 while (PL_curstackinfo->si_next)
614 PL_curstackinfo = PL_curstackinfo->si_next; 660 PL_curstackinfo = PL_curstackinfo->si_next;
615 661
616 while (PL_curstackinfo) 662 while (PL_curstackinfo)
… …
627 673
628 Safefree (PL_tmps_stack); 674 Safefree (PL_tmps_stack);
629 Safefree (PL_markstack); 675 Safefree (PL_markstack);
630 Safefree (PL_scopestack); 676 Safefree (PL_scopestack);
631 Safefree (PL_savestack); 677 Safefree (PL_savestack);
632#if !PERL_VERSION_ATLEAST (5,9,0) 678#if !PERL_VERSION_ATLEAST (5,10,0)
633 Safefree (PL_retstack); 679 Safefree (PL_retstack);
634#endif 680#endif
635} 681}
636 682
637static size_t 683static size_t
… …
653 #undef VAR 699 #undef VAR
654 } 700 }
655 else 701 else
656 slot = coro->slot; 702 slot = coro->slot;
657 703
704 if (slot)
705 {
658 rss += sizeof (slot->curstackinfo); 706 rss += sizeof (slot->curstackinfo);
659 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 707 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
660 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 *);
661 rss += slot->tmps_max * sizeof (SV *); 709 rss += slot->tmps_max * sizeof (SV *);
662 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 710 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
663 rss += slot->scopestack_max * sizeof (I32); 711 rss += slot->scopestack_max * sizeof (I32);
664 rss += slot->savestack_max * sizeof (ANY); 712 rss += slot->savestack_max * sizeof (ANY);
665 713
666#if !PERL_VERSION_ATLEAST (5,9,0) 714#if !PERL_VERSION_ATLEAST (5,10,0)
667 rss += slot->retstack_max * sizeof (OP *); 715 rss += slot->retstack_max * sizeof (OP *);
668#endif 716#endif
717 }
669 } 718 }
670 719
671 return rss; 720 return rss;
672} 721}
673 722
674/** 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}
675 827
676static void 828static void
677coro_setup (pTHX_ struct coro *coro) 829coro_setup (pTHX_ struct coro *coro)
678{ 830{
679 /* 831 /*
… …
688 PL_curpm = 0; 840 PL_curpm = 0;
689 PL_curpad = 0; 841 PL_curpad = 0;
690 PL_localizing = 0; 842 PL_localizing = 0;
691 PL_dirty = 0; 843 PL_dirty = 0;
692 PL_restartop = 0; 844 PL_restartop = 0;
693 PL_diehook = 0; hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0); 845#if PERL_VERSION_ATLEAST (5,10,0)
694 PL_warnhook = 0; hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0); 846 PL_parser = 0;
847#endif
848
849 /* recreate the die/warn hooks */
850 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
851 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
695 852
696 GvSV (PL_defgv) = newSV (0); 853 GvSV (PL_defgv) = newSV (0);
697 GvAV (PL_defgv) = coro->args; coro->args = 0; 854 GvAV (PL_defgv) = coro->args; coro->args = 0;
698 GvSV (PL_errgv) = newSV (0); 855 GvSV (PL_errgv) = newSV (0);
699 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);
700 PL_rs = newSVsv (GvSV (irsgv)); 857 PL_rs = newSVsv (GvSV (irsgv));
701 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv); 858 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
702 859
703 { 860 {
704 dSP; 861 dSP;
705 LOGOP myop; 862 UNOP myop;
706 863
707 Zero (&myop, 1, LOGOP); 864 Zero (&myop, 1, UNOP);
708 myop.op_next = Nullop; 865 myop.op_next = Nullop;
709 myop.op_flags = OPf_WANT_VOID; 866 myop.op_flags = OPf_WANT_VOID;
710 867
711 PUSHMARK (SP); 868 PUSHMARK (SP);
712 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv)))); 869 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
713 PUTBACK; 870 PUTBACK;
714 PL_op = (OP *)&myop; 871 PL_op = (OP *)&myop;
715 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 872 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
716 SPAGAIN; 873 SPAGAIN;
717
718 /*
719 * now its very tricky. the "tail" of the next transfer might end up
720 * either in a new cctx, or an existing one.
721 * in case of an existing one we have to take care of whatever
722 * entersub and transfer do to the perl stack.
723 */
724 ENTER;
725 EXTEND (SP, 4);
726 PUSHs ((SV *)0); /* items */
727 PUSHs ((SV *)0); /* ix, set_stacklevel */
728 PUSHs ((SV *)(sp - PL_stack_base + 1)); /* ax */
729 PUSHs ((SV *)0); /* again */
730 PUTBACK;
731 } 874 }
732 875
733 /* 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
734 * 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.
735 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
736 * so we ENTER here for symmetry
737 */ 878 */
738 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 */
739} 881}
740 882
741static void 883static void
742coro_destroy (pTHX_ struct coro *coro) 884coro_destruct (pTHX_ struct coro *coro)
743{ 885{
744 if (!IN_DESTRUCT) 886 if (!IN_DESTRUCT)
745 { 887 {
746 /* restore all saved variables and stuff */ 888 /* restore all saved variables and stuff */
747 LEAVE_SCOPE (0); 889 LEAVE_SCOPE (0);
… …
769 SvREFCNT_dec (PL_warnhook); 911 SvREFCNT_dec (PL_warnhook);
770 912
771 SvREFCNT_dec (coro->saved_deffh); 913 SvREFCNT_dec (coro->saved_deffh);
772 SvREFCNT_dec (coro->throw); 914 SvREFCNT_dec (coro->throw);
773 915
774 coro_destroy_stacks (aTHX); 916 coro_destruct_stacks (aTHX);
775} 917}
776 918
777static void 919INLINE void
778free_coro_mortal (pTHX) 920free_coro_mortal (pTHX)
779{ 921{
780 if (expect_true (coro_mortal)) 922 if (expect_true (coro_mortal))
781 { 923 {
782 SvREFCNT_dec (coro_mortal); 924 SvREFCNT_dec (coro_mortal);
… …
816 : cx->blk_gimme == G_SCALAR ? bot + 1 958 : cx->blk_gimme == G_SCALAR ? bot + 1
817 : bot; 959 : bot;
818 960
819 av_extend (av, top - bot); 961 av_extend (av, top - bot);
820 while (bot < top) 962 while (bot < top)
821 av_push (av, SvREFCNT_inc (*bot++)); 963 av_push (av, SvREFCNT_inc_NN (*bot++));
822 964
823 PL_runops = RUNOPS_DEFAULT; 965 PL_runops = RUNOPS_DEFAULT;
824 ENTER; 966 ENTER;
825 SAVETMPS; 967 SAVETMPS;
826 EXTEND (SP, 3); 968 EXTEND (SP, 3);
827 PUSHMARK (SP); 969 PUSHMARK (SP);
828 PUSHs (&PL_sv_no); 970 PUSHs (&PL_sv_no);
829 PUSHs (fullname); 971 PUSHs (fullname);
830 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 972 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
831 PUTBACK; 973 PUTBACK;
832 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 974 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
833 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 975 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
834 SPAGAIN; 976 SPAGAIN;
835 FREETMPS; 977 FREETMPS;
836 LEAVE; 978 LEAVE;
837 PL_runops = runops_trace; 979 PL_runops = runops_trace;
… …
864 SAVETMPS; 1006 SAVETMPS;
865 EXTEND (SP, 3); 1007 EXTEND (SP, 3);
866 PUSHMARK (SP); 1008 PUSHMARK (SP);
867 PUSHs (&PL_sv_yes); 1009 PUSHs (&PL_sv_yes);
868 PUSHs (fullname); 1010 PUSHs (fullname);
869 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);
870 PUTBACK; 1012 PUTBACK;
871 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_sub_cb"), 0); 1013 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
872 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);
873 SPAGAIN; 1015 SPAGAIN;
874 FREETMPS; 1016 FREETMPS;
875 LEAVE; 1017 LEAVE;
876 PL_runops = runops_trace; 1018 PL_runops = runops_trace;
… …
890 PL_runops = RUNOPS_DEFAULT; 1032 PL_runops = RUNOPS_DEFAULT;
891 PUSHMARK (SP); 1033 PUSHMARK (SP);
892 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1034 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
893 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1035 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
894 PUTBACK; 1036 PUTBACK;
895 cb = hv_fetch ((HV *)SvRV (coro_current), strpair ("_trace_line_cb"), 0); 1037 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
896 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1038 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
897 SPAGAIN; 1039 SPAGAIN;
898 FREETMPS; 1040 FREETMPS;
899 LEAVE; 1041 LEAVE;
900 PL_runops = runops_trace; 1042 PL_runops = runops_trace;
… …
906 1048
907 TAINT_NOT; 1049 TAINT_NOT;
908 return 0; 1050 return 0;
909} 1051}
910 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
911/* 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 */
912/* _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 */
913/* during execution of a perl program */ 1062/* during execution of a perl program */
1063/* also initialises PL_top_env */
914static void NOINLINE 1064static void NOINLINE
915cctx_prepare (pTHX_ coro_cctx *cctx) 1065cctx_prepare (pTHX_ coro_cctx *cctx)
916{ 1066{
917 dSP; 1067 dSP;
918 LOGOP myop; 1068 UNOP myop;
919 1069
920 PL_top_env = &PL_start_env; 1070 PL_top_env = &PL_start_env;
921 1071
922 if (cctx->flags & CC_TRACE) 1072 if (cctx->flags & CC_TRACE)
923 PL_runops = runops_trace; 1073 PL_runops = runops_trace;
924 1074
925 Zero (&myop, 1, LOGOP); 1075 Zero (&myop, 1, UNOP);
926 myop.op_next = PL_op; 1076 myop.op_next = PL_op;
927 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1077 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
928 1078
929 PUSHMARK (SP); 1079 PUSHMARK (SP);
930 EXTEND (SP, 2); 1080 EXTEND (SP, 2);
931 PUSHs (sv_2mortal (newSViv (PTR2IV (cctx)))); 1081 PUSHs (sv_2mortal (newSViv ((IV)cctx)));
932 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE)); 1082 PUSHs ((SV *)get_cv ("Coro::State::_cctx_init", FALSE));
933 PUTBACK; 1083 PUTBACK;
934 PL_op = (OP *)&myop; 1084 PL_op = (OP *)&myop;
935 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1085 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
936 SPAGAIN; 1086 SPAGAIN;
937} 1087}
938 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
939/* 1110/*
940 * this is a _very_ stripped down perl interpreter ;) 1111 * this is a _very_ stripped down perl interpreter ;)
941 */ 1112 */
942static void 1113static void
943cctx_run (void *arg) 1114cctx_run (void *arg)
944{ 1115{
1116#ifdef USE_ITHREADS
1117# if CORO_PTHREAD
1118 PERL_SET_CONTEXT (coro_thx);
1119# endif
1120#endif
1121 {
945 dTHX; 1122 dTHX;
946 1123
947 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1124 /* normally we would need to skip the entersub here */
948 UNLOCK; 1125 /* not doing so will re-execute it, which is exactly what we want */
949
950 /* we now skip the entersub that lead to transfer() */
951 PL_op = PL_op->op_next; 1126 /* PL_nop = PL_nop->op_next */
952 1127
953 /* inject a fake subroutine call to cctx_init */ 1128 /* inject a fake subroutine call to cctx_init */
954 cctx_prepare (aTHX_ (coro_cctx *)arg); 1129 cctx_prepare (aTHX_ (coro_cctx *)arg);
955 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
956 /* 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 */
957 PL_restartop = PL_op; 1136 PL_restartop = PL_op;
958 perl_run (PL_curinterp); 1137 perl_run (PL_curinterp);
959 1138
960 /* 1139 /*
961 * 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
962 * 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)
963 * 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
964 * bootstrap-time "top" top_env, as we cannot restore the "main" 1143 * bootstrap-time "top" top_env, as we cannot restore the "main"
965 * coroutine as Coro has no such concept 1144 * coroutine as Coro has no such concept
966 */ 1145 */
967 PL_top_env = main_top_env; 1146 PL_top_env = main_top_env;
968 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 }
969} 1149}
970 1150
971static coro_cctx * 1151static coro_cctx *
972cctx_new () 1152cctx_new ()
973{ 1153{
974 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 ();
975 void *stack_start; 1183 void *stack_start;
976 size_t stack_size; 1184 size_t stack_size;
977 1185
978 ++cctx_count;
979
980 Newz (0, cctx, 1, coro_cctx);
981
982#if HAVE_MMAP 1186#if HAVE_MMAP
983 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;
984 /* mmap supposedly does allocate-on-write for us */ 1188 /* mmap supposedly does allocate-on-write for us */
985 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);
986 1190
987 if (cctx->sptr != (void *)-1) 1191 if (cctx->sptr != (void *)-1)
988 { 1192 {
989# if CORO_STACKGUARD 1193 #if CORO_STACKGUARD
990 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE); 1194 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
991# endif 1195 #endif
992 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr; 1196 stack_start = (char *)cctx->sptr + CORO_STACKGUARD * PAGESIZE;
993 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE; 1197 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
994 cctx->flags |= CC_MAPPED; 1198 cctx->flags |= CC_MAPPED;
995 } 1199 }
996 else 1200 else
997#endif 1201#endif
998 { 1202 {
999 cctx->ssize = coro_stacksize * (long)sizeof (long); 1203 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1000 New (0, cctx->sptr, coro_stacksize, long); 1204 New (0, cctx->sptr, cctx_stacksize, long);
1001 1205
1002 if (!cctx->sptr) 1206 if (!cctx->sptr)
1003 { 1207 {
1004 perror ("FATAL: unable to allocate stack for coroutine"); 1208 perror ("FATAL: unable to allocate stack for coroutine, exiting.");
1005 _exit (EXIT_FAILURE); 1209 _exit (EXIT_FAILURE);
1006 } 1210 }
1007 1211
1008 stack_start = cctx->sptr; 1212 stack_start = cctx->sptr;
1009 stack_size = cctx->ssize; 1213 stack_size = cctx->ssize;
1010 } 1214 }
1011 1215
1012 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
1013 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);
1014 1221
1015 return cctx; 1222 return cctx;
1016} 1223}
1017 1224
… …
1020{ 1227{
1021 if (!cctx) 1228 if (!cctx)
1022 return; 1229 return;
1023 1230
1024 --cctx_count; 1231 --cctx_count;
1232 coro_destroy (&cctx->cctx);
1025 1233
1234 /* coro_transfer creates new, empty cctx's */
1235 if (cctx->sptr)
1236 {
1026#if CORO_USE_VALGRIND 1237 #if CORO_USE_VALGRIND
1027 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1238 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1028#endif 1239 #endif
1029 1240
1030#if HAVE_MMAP 1241#if HAVE_MMAP
1031 if (cctx->flags & CC_MAPPED) 1242 if (cctx->flags & CC_MAPPED)
1032 munmap (cctx->sptr, cctx->ssize); 1243 munmap (cctx->sptr, cctx->ssize);
1033 else 1244 else
1034#endif 1245#endif
1035 Safefree (cctx->sptr); 1246 Safefree (cctx->sptr);
1247 }
1036 1248
1037 Safefree (cctx); 1249 Safefree (cctx);
1038} 1250}
1039 1251
1040/* wether this cctx should be destructed */ 1252/* wether this cctx should be destructed */
1041#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))
1042 1254
1043static coro_cctx * 1255static coro_cctx *
1044cctx_get (pTHX_ int gimme) 1256cctx_get (pTHX)
1045{ 1257{
1046 while (expect_true (cctx_first[gimme])) 1258 while (expect_true (cctx_first))
1047 { 1259 {
1048 coro_cctx *cctx = cctx_first[gimme]; 1260 coro_cctx *cctx = cctx_first;
1049 cctx_first[gimme] = cctx->next; 1261 cctx_first = cctx->next;
1050 --cctx_idle[gimme]; 1262 --cctx_idle;
1051 1263
1052 if (expect_true (!CCTX_EXPIRED (cctx))) 1264 if (expect_true (!CCTX_EXPIRED (cctx)))
1053 return cctx; 1265 return cctx;
1054 1266
1055 cctx_destroy (cctx); 1267 cctx_destroy (cctx);
1056 } 1268 }
1057 1269
1058 assert (!gimme);
1059 return cctx_new (); 1270 return cctx_new_run ();
1060} 1271}
1061 1272
1062static void 1273static void
1063cctx_put (coro_cctx *cctx, int gimme) 1274cctx_put (coro_cctx *cctx)
1064{ 1275{
1276 assert (("FATAL: cctx_put called on non-initialised cctx in Coro (please report)", cctx->sptr));
1277
1065 /* free another cctx if overlimit */ 1278 /* free another cctx if overlimit */
1066 if (expect_false (cctx_idle[gimme] >= MAX_IDLE_CCTX)) 1279 if (expect_false (cctx_idle >= cctx_max_idle))
1067 { 1280 {
1068 coro_cctx *first = cctx_first[gimme]; 1281 coro_cctx *first = cctx_first;
1069 cctx_first[gimme] = first->next; 1282 cctx_first = first->next;
1070 --cctx_idle[gimme]; 1283 --cctx_idle;
1071 1284
1072 cctx_destroy (first); 1285 cctx_destroy (first);
1073 } 1286 }
1074 1287
1075 ++cctx_idle[gimme]; 1288 ++cctx_idle;
1076 cctx->next = cctx_first[gimme]; 1289 cctx->next = cctx_first;
1077 cctx_first[gimme] = cctx; 1290 cctx_first = cctx;
1078} 1291}
1079 1292
1080/** coroutine switching *****************************************************/ 1293/** coroutine switching *****************************************************/
1081 1294
1082static void 1295static void
1083transfer_check (pTHX_ struct coro *prev, struct coro *next) 1296transfer_check (pTHX_ struct coro *prev, struct coro *next)
1084{ 1297{
1085 if (expect_true (prev != next)) 1298 if (expect_true (prev != next))
1086 { 1299 {
1087 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1300 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1088 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,");
1089 1302
1090 if (expect_false (next->flags & CF_RUNNING)) 1303 if (expect_false (next->flags & CF_RUNNING))
1091 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,");
1092 1305
1093 if (expect_false (next->flags & CF_DESTROYED)) 1306 if (expect_false (next->flags & CF_DESTROYED))
1094 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,");
1095 1308
1096 if (
1097#if PERL_VERSION_ATLEAST (5,9,0) 1309#if !PERL_VERSION_ATLEAST (5,10,0)
1098 expect_false (PL_parser)
1099#else
1100 expect_false (PL_lex_state != LEX_NOTPARSING) 1310 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1101#endif
1102 )
1103 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
1104 } 1313 }
1105} 1314}
1106 1315
1107/* always use the TRANSFER macro */ 1316/* always use the TRANSFER macro */
1108static void NOINLINE 1317static void NOINLINE
1109transfer (pTHX_ struct coro *prev, struct coro *next) 1318transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1110{ 1319{
1111 dSTACKLEVEL; 1320 dSTACKLEVEL;
1112 1321
1113 /* sometimes transfer is only called to set idle_sp */ 1322 /* sometimes transfer is only called to set idle_sp */
1114 if (expect_false (!next)) 1323 if (expect_false (!next))
1115 { 1324 {
1116 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1325 ((coro_cctx *)prev)->idle_sp = stacklevel;
1117 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 */
1118 } 1327 }
1119 else if (expect_true (prev != next)) 1328 else if (expect_true (prev != next))
1120 { 1329 {
1121 coro_cctx *prev__cctx; 1330 coro_cctx *prev__cctx;
1122 1331
1123 if (expect_false (prev->flags & CF_NEW)) 1332 if (expect_false (prev->flags & CF_NEW))
1124 { 1333 {
1125 /* create a new empty context */ 1334 /* create a new empty/source context */
1126 Newz (0, prev->cctx, 1, coro_cctx); 1335 prev->cctx = cctx_new_empty ();
1127 prev->flags &= ~CF_NEW; 1336 prev->flags &= ~CF_NEW;
1128 prev->flags |= CF_RUNNING; 1337 prev->flags |= CF_RUNNING;
1129 } 1338 }
1130 1339
1131 prev->flags &= ~CF_RUNNING; 1340 prev->flags &= ~CF_RUNNING;
1132 next->flags |= CF_RUNNING; 1341 next->flags |= CF_RUNNING;
1133 1342
1134 LOCK; 1343 LOCK;
1344
1345 /* first get rid of the old state */
1346 save_perl (aTHX_ prev);
1135 1347
1136 if (expect_false (next->flags & CF_NEW)) 1348 if (expect_false (next->flags & CF_NEW))
1137 { 1349 {
1138 /* need to start coroutine */ 1350 /* need to start coroutine */
1139 next->flags &= ~CF_NEW; 1351 next->flags &= ~CF_NEW;
1140 /* first get rid of the old state */
1141 save_perl (aTHX_ prev);
1142 /* setup coroutine call */ 1352 /* setup coroutine call */
1143 coro_setup (aTHX_ next); 1353 coro_setup (aTHX_ next);
1144 } 1354 }
1145 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 ))
1146 { 1366 {
1147 /* coroutine already started */
1148 save_perl (aTHX_ prev);
1149 load_perl (aTHX_ next);
1150 }
1151
1152 prev__cctx = prev->cctx;
1153
1154 /* possibly "free" the cctx */
1155 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1156 {
1157 /* 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 */
1158 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));
1159 1369
1160 prev->cctx = 0; 1370 prev->cctx = 0;
1161 1371
1162 /* 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 */
1163 /* 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 */
1164 if (expect_false (CCTX_EXPIRED (prev__cctx))) 1374 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1165 if (!next->cctx) 1375 if (!next->cctx)
1166 next->cctx = cctx_get (aTHX_ next->gimme); 1376 next->cctx = cctx_get (aTHX);
1167 1377
1168 cctx_put (prev__cctx, prev->gimme); 1378 cctx_put (prev__cctx);
1169 } 1379 }
1170 1380
1171 ++next->usecount; 1381 ++next->usecount;
1172 1382
1173 if (expect_true (!next->cctx)) 1383 if (expect_true (!next->cctx))
1174 next->cctx = cctx_get (aTHX_ next->gimme); 1384 next->cctx = cctx_get (aTHX);
1385
1386 assert (("FATAL: transfer_next already nonzero in Coro (please report)", !transfer_next));
1387 transfer_next = next;
1175 1388
1176 if (expect_false (prev__cctx != next->cctx)) 1389 if (expect_false (prev__cctx != next->cctx))
1177 { 1390 {
1178 prev__cctx->top_env = PL_top_env; 1391 prev__cctx->top_env = PL_top_env;
1179 PL_top_env = next->cctx->top_env; 1392 PL_top_env = next->cctx->top_env;
1180 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1393 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1181 } 1394 }
1182 1395
1183 free_coro_mortal (aTHX); 1396 transfer_tail (aTHX);
1184 UNLOCK;
1185
1186 if (expect_false (prev->throw || next->throw))
1187 {
1188 struct coro *coro = SvSTATE (coro_current);
1189
1190 if (coro->throw)
1191 {
1192 SV *exception = coro->throw;
1193 coro->throw = 0;
1194 sv_setsv (ERRSV, exception);
1195 croak (0);
1196 }
1197 }
1198 } 1397 }
1199} 1398}
1200 1399
1201struct transfer_args
1202{
1203 struct coro *prev, *next;
1204};
1205
1206#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1400#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1207#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1401#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1208 1402
1209/** high level stuff ********************************************************/ 1403/** high level stuff ********************************************************/
1210 1404
1211static int 1405static int
… …
1229 1423
1230 if (coro->mainstack && coro->mainstack != main_mainstack) 1424 if (coro->mainstack && coro->mainstack != main_mainstack)
1231 { 1425 {
1232 struct coro temp; 1426 struct coro temp;
1233 1427
1234 if (coro->flags & CF_RUNNING) 1428 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1235 croak ("FATAL: tried to destroy currently running coroutine");
1236 1429
1237 save_perl (aTHX_ &temp); 1430 save_perl (aTHX_ &temp);
1238 load_perl (aTHX_ coro); 1431 load_perl (aTHX_ coro);
1239 1432
1240 coro_destroy (aTHX_ coro); 1433 coro_destruct (aTHX_ coro);
1241 1434
1242 load_perl (aTHX_ &temp); 1435 load_perl (aTHX_ &temp);
1243 1436
1244 coro->slot = 0; 1437 coro->slot = 0;
1245 } 1438 }
… …
1291# define MGf_DUP 0 1484# define MGf_DUP 0
1292#endif 1485#endif
1293}; 1486};
1294 1487
1295static void 1488static void
1296prepare_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)
1297{ 1490{
1298 ta->prev = SvSTATE (prev_sv); 1491 ta->prev = SvSTATE (prev_sv);
1299 ta->next = SvSTATE (next_sv); 1492 ta->next = SvSTATE (next_sv);
1300 TRANSFER_CHECK (*ta); 1493 TRANSFER_CHECK (*ta);
1301} 1494}
1302 1495
1303static void 1496static void
1304api_transfer (SV *prev_sv, SV *next_sv) 1497api_transfer (pTHX_ SV *prev_sv, SV *next_sv)
1305{ 1498{
1306 dTHX;
1307 struct transfer_args ta; 1499 struct coro_transfer_args ta;
1308 1500
1309 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1501 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1310 TRANSFER (ta); 1502 TRANSFER (ta, 1);
1311} 1503}
1312 1504
1313/** Coro ********************************************************************/ 1505/** Coro ********************************************************************/
1314 1506
1315static void 1507static void
… …
1317{ 1509{
1318 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);
1319} 1511}
1320 1512
1321static SV * 1513static SV *
1322coro_deq (pTHX_ int min_prio) 1514coro_deq (pTHX)
1323{ 1515{
1324 int prio = PRIO_MAX - PRIO_MIN; 1516 int prio;
1325 1517
1326 min_prio -= PRIO_MIN;
1327 if (min_prio < 0)
1328 min_prio = 0;
1329
1330 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1518 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1331 if (AvFILLp (coro_ready [prio]) >= 0) 1519 if (AvFILLp (coro_ready [prio]) >= 0)
1332 return av_shift (coro_ready [prio]); 1520 return av_shift (coro_ready [prio]);
1333 1521
1334 return 0; 1522 return 0;
1335} 1523}
1336 1524
1337static int 1525static int
1338api_ready (SV *coro_sv) 1526api_ready (pTHX_ SV *coro_sv)
1339{ 1527{
1340 dTHX;
1341 struct coro *coro; 1528 struct coro *coro;
1529 SV *sv_hook;
1530 void (*xs_hook)(void);
1342 1531
1343 if (SvROK (coro_sv)) 1532 if (SvROK (coro_sv))
1344 coro_sv = SvRV (coro_sv); 1533 coro_sv = SvRV (coro_sv);
1345 1534
1346 coro = SvSTATE (coro_sv); 1535 coro = SvSTATE (coro_sv);
… …
1349 return 0; 1538 return 0;
1350 1539
1351 coro->flags |= CF_READY; 1540 coro->flags |= CF_READY;
1352 1541
1353 LOCK; 1542 LOCK;
1543
1544 sv_hook = coro_nready ? 0 : coro_readyhook;
1545 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1546
1354 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1547 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1355 ++coro_nready; 1548 ++coro_nready;
1549
1356 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 ();
1357 1570
1358 return 1; 1571 return 1;
1359} 1572}
1360 1573
1361static int 1574static int
1362api_is_ready (SV *coro_sv) 1575api_is_ready (pTHX_ SV *coro_sv)
1363{ 1576{
1364 dTHX;
1365 return !!(SvSTATE (coro_sv)->flags & CF_READY); 1577 return !!(SvSTATE (coro_sv)->flags & CF_READY);
1366} 1578}
1367 1579
1368static void 1580INLINE void
1369prepare_schedule (pTHX_ struct transfer_args *ta) 1581prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1370{ 1582{
1371 SV *prev_sv, *next_sv; 1583 SV *prev_sv, *next_sv;
1372 1584
1373 for (;;) 1585 for (;;)
1374 { 1586 {
1375 LOCK; 1587 LOCK;
1376 next_sv = coro_deq (aTHX_ PRIO_MIN); 1588 next_sv = coro_deq (aTHX);
1377 1589
1378 /* nothing to schedule: call the idle handler */ 1590 /* nothing to schedule: call the idle handler */
1379 if (expect_false (!next_sv)) 1591 if (expect_false (!next_sv))
1380 { 1592 {
1381 dSP; 1593 dSP;
… …
1385 SAVETMPS; 1597 SAVETMPS;
1386 1598
1387 PUSHMARK (SP); 1599 PUSHMARK (SP);
1388 PUTBACK; 1600 PUTBACK;
1389 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1601 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1602 SPAGAIN;
1390 1603
1391 FREETMPS; 1604 FREETMPS;
1392 LEAVE; 1605 LEAVE;
1393 continue; 1606 continue;
1394 } 1607 }
… …
1398 /* cannot transfer to destroyed coros, skip and look for next */ 1611 /* cannot transfer to destroyed coros, skip and look for next */
1399 if (expect_false (ta->next->flags & CF_DESTROYED)) 1612 if (expect_false (ta->next->flags & CF_DESTROYED))
1400 { 1613 {
1401 UNLOCK; 1614 UNLOCK;
1402 SvREFCNT_dec (next_sv); 1615 SvREFCNT_dec (next_sv);
1403 /* coro_nready is already taken care of by destroy */ 1616 /* coro_nready has already been taken care of by destroy */
1404 continue; 1617 continue;
1405 } 1618 }
1406 1619
1407 --coro_nready; 1620 --coro_nready;
1408 UNLOCK; 1621 UNLOCK;
… …
1411 1624
1412 /* free this only after the transfer */ 1625 /* free this only after the transfer */
1413 prev_sv = SvRV (coro_current); 1626 prev_sv = SvRV (coro_current);
1414 ta->prev = SvSTATE (prev_sv); 1627 ta->prev = SvSTATE (prev_sv);
1415 TRANSFER_CHECK (*ta); 1628 TRANSFER_CHECK (*ta);
1416 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));
1417 ta->next->flags &= ~CF_READY; 1630 ta->next->flags &= ~CF_READY;
1418 SvRV_set (coro_current, next_sv); 1631 SvRV_set (coro_current, next_sv);
1419 1632
1420 LOCK; 1633 LOCK;
1421 free_coro_mortal (aTHX); 1634 free_coro_mortal (aTHX);
1422 coro_mortal = prev_sv; 1635 coro_mortal = prev_sv;
1423 UNLOCK; 1636 UNLOCK;
1424} 1637}
1425 1638
1426static void 1639INLINE void
1427prepare_cede (pTHX_ struct transfer_args *ta) 1640prepare_cede (pTHX_ struct coro_transfer_args *ta)
1428{ 1641{
1429 api_ready (coro_current); 1642 api_ready (aTHX_ coro_current);
1430 prepare_schedule (aTHX_ ta); 1643 prepare_schedule (aTHX_ ta);
1431} 1644}
1432 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
1433static int 1669static int
1434prepare_cede_notself (pTHX_ struct transfer_args *ta) 1670api_cede (pTHX)
1435{ 1671{
1436 if (coro_nready) 1672 struct coro_transfer_args ta;
1437 { 1673
1438 SV *prev = SvRV (coro_current);
1439 prepare_schedule (aTHX_ ta); 1674 prepare_cede (aTHX_ &ta);
1440 api_ready (prev); 1675
1676 if (expect_true (ta.prev != ta.next))
1677 {
1678 TRANSFER (ta, 1);
1441 return 1; 1679 return 1;
1442 } 1680 }
1443 else 1681 else
1444 return 0; 1682 return 0;
1445} 1683}
1446 1684
1447static void
1448api_schedule (void)
1449{
1450 dTHX;
1451 struct transfer_args ta;
1452
1453 prepare_schedule (aTHX_ &ta);
1454 TRANSFER (ta);
1455}
1456
1457static int 1685static int
1458api_cede (void) 1686api_cede_notself (pTHX)
1459{ 1687{
1460 dTHX; 1688 if (coro_nready)
1689 {
1461 struct transfer_args ta; 1690 struct coro_transfer_args ta;
1462 1691
1463 prepare_cede (aTHX_ &ta); 1692 prepare_cede_notself (aTHX_ &ta);
1464
1465 if (expect_true (ta.prev != ta.next))
1466 {
1467 TRANSFER (ta); 1693 TRANSFER (ta, 1);
1468 return 1; 1694 return 1;
1469 } 1695 }
1470 else 1696 else
1471 return 0; 1697 return 0;
1472} 1698}
1473 1699
1474static int 1700static void
1475api_cede_notself (void)
1476{
1477 dTHX;
1478 struct transfer_args ta;
1479
1480 if (prepare_cede_notself (aTHX_ &ta))
1481 {
1482 TRANSFER (ta);
1483 return 1;
1484 }
1485 else
1486 return 0;
1487}
1488
1489static void
1490api_trace (SV *coro_sv, int flags) 1701api_trace (pTHX_ SV *coro_sv, int flags)
1491{ 1702{
1492 dTHX;
1493 struct coro *coro = SvSTATE (coro_sv); 1703 struct coro *coro = SvSTATE (coro_sv);
1494 1704
1495 if (flags & CC_TRACE) 1705 if (flags & CC_TRACE)
1496 { 1706 {
1497 if (!coro->cctx) 1707 if (!coro->cctx)
1498 coro->cctx = cctx_new (); 1708 coro->cctx = cctx_new_run ();
1499 else if (!(coro->cctx->flags & CC_TRACE)) 1709 else if (!(coro->cctx->flags & CC_TRACE))
1500 croak ("cannot enable tracing on coroutine with custom stack"); 1710 croak ("cannot enable tracing on coroutine with custom stack,");
1501 1711
1502 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL)); 1712 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1503 } 1713 }
1504 else if (coro->cctx && coro->cctx->flags & CC_TRACE) 1714 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1505 { 1715 {
… …
1510 else 1720 else
1511 coro->slot->runops = RUNOPS_DEFAULT; 1721 coro->slot->runops = RUNOPS_DEFAULT;
1512 } 1722 }
1513} 1723}
1514 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, caught");
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
1515MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 2018MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1516 2019
1517PROTOTYPES: DISABLE 2020PROTOTYPES: DISABLE
1518 2021
1519BOOT: 2022BOOT:
1520{ 2023{
1521#ifdef USE_ITHREADS 2024#ifdef USE_ITHREADS
1522 MUTEX_INIT (&coro_mutex); 2025 MUTEX_INIT (&coro_lock);
2026# if CORO_PTHREAD
2027 coro_thx = PERL_GET_CONTEXT;
2028# endif
1523#endif 2029#endif
1524 BOOT_PAGESIZE; 2030 BOOT_PAGESIZE;
1525 2031
1526 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 2032 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1527 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 2033 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1528 2034
2035 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
2036 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
2037 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
2038
1529 hv_sig = coro_get_hv ("SIG", TRUE); 2039 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1530 sv_diehook = coro_get_sv ("Coro::State::DIEHOOK" , TRUE); 2040 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1531 sv_warnhook = coro_get_sv ("Coro::State::WARNHOOK", TRUE); 2041 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1532
1533 if (!PL_diehook ) hv_store (hv_sig, strpair ("__DIE__" ), SvREFCNT_inc (sv_diehook ), 0);
1534 if (!PL_warnhook) hv_store (hv_sig, strpair ("__WARN__"), SvREFCNT_inc (sv_warnhook), 0);
1535 2042
1536 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 2043 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1537 2044
1538 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 2045 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1539 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 2046 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
… …
1544 main_top_env = PL_top_env; 2051 main_top_env = PL_top_env;
1545 2052
1546 while (main_top_env->je_prev) 2053 while (main_top_env->je_prev)
1547 main_top_env = main_top_env->je_prev; 2054 main_top_env = main_top_env->je_prev;
1548 2055
1549 coroapi.ver = CORO_API_VERSION; 2056 coroapi.ver = CORO_API_VERSION;
1550 coroapi.rev = CORO_API_REVISION; 2057 coroapi.rev = CORO_API_REVISION;
2058
1551 coroapi.transfer = api_transfer; 2059 coroapi.transfer = api_transfer;
2060
2061 coroapi.sv_state = SvSTATE_;
2062 coroapi.execute_slf = api_execute_slf;
2063 coroapi.prepare_nop = prepare_nop;
2064 coroapi.prepare_schedule = prepare_schedule;
2065 coroapi.prepare_cede = prepare_cede;
2066 coroapi.prepare_cede_notself = prepare_cede_notself;
2067
2068 {
2069 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
2070
2071 if (!svp) croak ("Time::HiRes is required");
2072 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
2073
2074 nvtime = INT2PTR (double (*)(), SvIV (*svp));
2075 }
1552 2076
1553 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 2077 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1554} 2078}
1555 2079
1556SV * 2080SV *
1557new (char *klass, ...) 2081new (char *klass, ...)
1558 CODE: 2082 CODE:
1559{ 2083{
1560 struct coro *coro; 2084 struct coro *coro;
2085 MAGIC *mg;
1561 HV *hv; 2086 HV *hv;
1562 int i; 2087 int i;
1563 2088
1564 Newz (0, coro, 1, struct coro); 2089 Newz (0, coro, 1, struct coro);
1565 coro->args = newAV (); 2090 coro->args = newAV ();
… …
1568 if (coro_first) coro_first->prev = coro; 2093 if (coro_first) coro_first->prev = coro;
1569 coro->next = coro_first; 2094 coro->next = coro_first;
1570 coro_first = coro; 2095 coro_first = coro;
1571 2096
1572 coro->hv = hv = newHV (); 2097 coro->hv = hv = newHV ();
1573 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 2098 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
2099 mg->mg_flags |= MGf_DUP;
1574 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 2100 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1575 2101
1576 av_extend (coro->args, items - 1); 2102 av_extend (coro->args, items - 1);
1577 for (i = 1; i < items; i++) 2103 for (i = 1; i < items; i++)
1578 av_push (coro->args, newSVsv (ST (i))); 2104 av_push (coro->args, newSVsv (ST (i)));
1579} 2105}
1580 OUTPUT: 2106 OUTPUT:
1581 RETVAL 2107 RETVAL
1582 2108
1583# these not obviously related functions are all rolled into the same xs
1584# function to increase chances that they all will call transfer with the same
1585# stack offset
1586void 2109void
1587_set_stacklevel (...) 2110_set_stacklevel (...)
1588 ALIAS: 2111 CODE:
1589 Coro::State::transfer = 1 2112 api_execute_slf (aTHX_ cv, slf_init_set_stacklevel, &ST (0), items);
1590 Coro::schedule = 2
1591 Coro::cede = 3
1592 Coro::cede_notself = 4
1593 CODE:
1594{
1595 struct transfer_args ta;
1596 2113
1597 switch (ix) 2114void
1598 { 2115transfer (...)
1599 case 0: 2116 CODE:
1600 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 2117 api_execute_slf (aTHX_ cv, slf_init_transfer, &ST (0), items);
1601 ta.next = 0;
1602 break;
1603
1604 case 1:
1605 if (items != 2)
1606 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1607
1608 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1609 break;
1610
1611 case 2:
1612 prepare_schedule (aTHX_ &ta);
1613 break;
1614
1615 case 3:
1616 prepare_cede (aTHX_ &ta);
1617 break;
1618
1619 case 4:
1620 if (!prepare_cede_notself (aTHX_ &ta))
1621 XSRETURN_EMPTY;
1622
1623 break;
1624 }
1625
1626 BARRIER;
1627 PUTBACK;
1628 TRANSFER (ta);
1629 SPAGAIN; /* might be the sp of a different coroutine now */
1630 /* be extra careful not to ever do anything after TRANSFER */
1631}
1632 2118
1633bool 2119bool
1634_destroy (SV *coro_sv) 2120_destroy (SV *coro_sv)
1635 CODE: 2121 CODE:
1636 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 2122 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1637 OUTPUT: 2123 OUTPUT:
1638 RETVAL 2124 RETVAL
1639 2125
1640void 2126void
1641_exit (code) 2127_exit (int code)
1642 int code
1643 PROTOTYPE: $ 2128 PROTOTYPE: $
1644 CODE: 2129 CODE:
1645 _exit (code); 2130 _exit (code);
1646 2131
1647int 2132int
1648cctx_stacksize (int new_stacksize = 0) 2133cctx_stacksize (int new_stacksize = 0)
1649 CODE: 2134 CODE:
1650 RETVAL = coro_stacksize; 2135 RETVAL = cctx_stacksize;
1651 if (new_stacksize) 2136 if (new_stacksize)
2137 {
1652 coro_stacksize = new_stacksize; 2138 cctx_stacksize = new_stacksize;
2139 ++cctx_gen;
2140 }
2141 OUTPUT:
2142 RETVAL
2143
2144int
2145cctx_max_idle (int max_idle = 0)
2146 CODE:
2147 RETVAL = cctx_max_idle;
2148 if (max_idle > 1)
2149 cctx_max_idle = max_idle;
1653 OUTPUT: 2150 OUTPUT:
1654 RETVAL 2151 RETVAL
1655 2152
1656int 2153int
1657cctx_count () 2154cctx_count ()
… …
1661 RETVAL 2158 RETVAL
1662 2159
1663int 2160int
1664cctx_idle () 2161cctx_idle ()
1665 CODE: 2162 CODE:
1666 RETVAL = cctx_idle[0] + cctx_idle[1] + cctx_idle[2]; 2163 RETVAL = cctx_idle;
1667 OUTPUT: 2164 OUTPUT:
1668 RETVAL 2165 RETVAL
1669 2166
1670void 2167void
1671list () 2168list ()
… …
1681call (Coro::State coro, SV *coderef) 2178call (Coro::State coro, SV *coderef)
1682 ALIAS: 2179 ALIAS:
1683 eval = 1 2180 eval = 1
1684 CODE: 2181 CODE:
1685{ 2182{
1686 if (coro->mainstack) 2183 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1687 { 2184 {
1688 struct coro temp; 2185 struct coro temp;
1689 2186
1690 if (!(coro->flags & CF_RUNNING)) 2187 if (!(coro->flags & CF_RUNNING))
1691 { 2188 {
2189 PUTBACK;
1692 save_perl (aTHX_ &temp); 2190 save_perl (aTHX_ &temp);
1693 load_perl (aTHX_ coro); 2191 load_perl (aTHX_ coro);
1694 } 2192 }
1695 2193
1696 { 2194 {
… …
1705 eval_sv (coderef, 0); 2203 eval_sv (coderef, 0);
1706 else 2204 else
1707 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 2205 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1708 2206
1709 POPSTACK; 2207 POPSTACK;
2208 SPAGAIN;
1710 FREETMPS; 2209 FREETMPS;
1711 LEAVE; 2210 LEAVE;
1712 PUTBACK; 2211 PUTBACK;
1713 } 2212 }
1714 2213
1715 if (!(coro->flags & CF_RUNNING)) 2214 if (!(coro->flags & CF_RUNNING))
1716 { 2215 {
1717 save_perl (aTHX_ coro); 2216 save_perl (aTHX_ coro);
1718 load_perl (aTHX_ &temp); 2217 load_perl (aTHX_ &temp);
2218 SPAGAIN;
1719 } 2219 }
1720 } 2220 }
1721} 2221}
1722 2222
1723SV * 2223SV *
… …
1732 RETVAL = boolSV (coro->flags & ix); 2232 RETVAL = boolSV (coro->flags & ix);
1733 OUTPUT: 2233 OUTPUT:
1734 RETVAL 2234 RETVAL
1735 2235
1736void 2236void
2237throw (Coro::State self, SV *throw = &PL_sv_undef)
2238 PROTOTYPE: $;$
2239 CODE:
2240 SvREFCNT_dec (self->throw);
2241 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2242
2243void
1737api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 2244api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
2245 C_ARGS: aTHX_ coro, flags
1738 2246
1739SV * 2247SV *
1740has_stack (Coro::State coro) 2248has_cctx (Coro::State coro)
1741 PROTOTYPE: $ 2249 PROTOTYPE: $
1742 CODE: 2250 CODE:
1743 RETVAL = boolSV (!!coro->cctx); 2251 RETVAL = boolSV (!!coro->cctx);
1744 OUTPUT: 2252 OUTPUT:
1745 RETVAL 2253 RETVAL
… …
1750 CODE: 2258 CODE:
1751 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2259 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1752 OUTPUT: 2260 OUTPUT:
1753 RETVAL 2261 RETVAL
1754 2262
1755IV 2263UV
1756rss (Coro::State coro) 2264rss (Coro::State coro)
1757 PROTOTYPE: $ 2265 PROTOTYPE: $
1758 ALIAS: 2266 ALIAS:
1759 usecount = 1 2267 usecount = 1
1760 CODE: 2268 CODE:
… …
1764 case 1: RETVAL = coro->usecount; break; 2272 case 1: RETVAL = coro->usecount; break;
1765 } 2273 }
1766 OUTPUT: 2274 OUTPUT:
1767 RETVAL 2275 RETVAL
1768 2276
2277void
2278force_cctx ()
2279 CODE:
2280 struct coro *coro = SvSTATE (coro_current);
2281 coro->cctx->idle_sp = 0;
2282
2283void
2284swap_defsv (Coro::State self)
2285 PROTOTYPE: $
2286 ALIAS:
2287 swap_defav = 1
2288 CODE:
2289 if (!self->slot)
2290 croak ("cannot swap state with coroutine that has no saved state,");
2291 else
2292 {
2293 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2294 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2295
2296 SV *tmp = *src; *src = *dst; *dst = tmp;
2297 }
1769 2298
1770MODULE = Coro::State PACKAGE = Coro 2299MODULE = Coro::State PACKAGE = Coro
1771 2300
1772BOOT: 2301BOOT:
1773{ 2302{
1774 int i; 2303 int i;
1775 2304
1776 sv_pool_rss = coro_get_sv ("Coro::POOL_RSS" , TRUE);
1777 sv_pool_size = coro_get_sv ("Coro::POOL_SIZE" , TRUE);
1778 av_async_pool = coro_get_av ("Coro::async_pool", TRUE); 2305 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2306 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2307 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1779 2308
1780 coro_current = coro_get_sv ("Coro::current", FALSE); 2309 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1781 SvREADONLY_on (coro_current); 2310 SvREADONLY_on (coro_current);
1782 2311
1783 coro_stash = gv_stashpv ("Coro", TRUE); 2312 coro_stash = gv_stashpv ("Coro", TRUE);
1784 2313
1785 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 2314 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
… …
1791 2320
1792 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2321 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1793 coro_ready[i] = newAV (); 2322 coro_ready[i] = newAV ();
1794 2323
1795 { 2324 {
1796 SV *sv = perl_get_sv ("Coro::API", TRUE); 2325 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
1797 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1798 2326
1799 coroapi.schedule = api_schedule; 2327 coroapi.schedule = api_schedule;
1800 coroapi.cede = api_cede; 2328 coroapi.cede = api_cede;
1801 coroapi.cede_notself = api_cede_notself; 2329 coroapi.cede_notself = api_cede_notself;
1802 coroapi.ready = api_ready; 2330 coroapi.ready = api_ready;
1803 coroapi.is_ready = api_is_ready; 2331 coroapi.is_ready = api_is_ready;
1804 coroapi.nready = &coro_nready; 2332 coroapi.nready = coro_nready;
1805 coroapi.current = coro_current; 2333 coroapi.current = coro_current;
1806 2334
1807 GCoroAPI = &coroapi; 2335 GCoroAPI = &coroapi;
1808 sv_setiv (sv, (IV)&coroapi); 2336 sv_setiv (sv, (IV)&coroapi);
1809 SvREADONLY_on (sv); 2337 SvREADONLY_on (sv);
1810 } 2338 }
1811} 2339}
2340
2341void
2342schedule (...)
2343 CODE:
2344 api_execute_slf (aTHX_ cv, slf_init_schedule, &ST (0), items);
2345
2346void
2347cede (...)
2348 CODE:
2349 api_execute_slf (aTHX_ cv, slf_init_cede, &ST (0), items);
2350
2351void
2352cede_notself (...)
2353 CODE:
2354 api_execute_slf (aTHX_ cv, slf_init_cede_notself, &ST (0), items);
1812 2355
1813void 2356void
1814_set_current (SV *current) 2357_set_current (SV *current)
1815 PROTOTYPE: $ 2358 PROTOTYPE: $
1816 CODE: 2359 CODE:
1817 SvREFCNT_dec (SvRV (coro_current)); 2360 SvREFCNT_dec (SvRV (coro_current));
1818 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;
1819 2371
1820int 2372int
1821prio (Coro::State coro, int newprio = 0) 2373prio (Coro::State coro, int newprio = 0)
1822 ALIAS: 2374 ALIAS:
1823 nice = 1 2375 nice = 1
… …
1841 2393
1842SV * 2394SV *
1843ready (SV *self) 2395ready (SV *self)
1844 PROTOTYPE: $ 2396 PROTOTYPE: $
1845 CODE: 2397 CODE:
1846 RETVAL = boolSV (api_ready (self)); 2398 RETVAL = boolSV (api_ready (aTHX_ self));
1847 OUTPUT: 2399 OUTPUT:
1848 RETVAL 2400 RETVAL
1849 2401
1850int 2402int
1851nready (...) 2403nready (...)
… …
1853 CODE: 2405 CODE:
1854 RETVAL = coro_nready; 2406 RETVAL = coro_nready;
1855 OUTPUT: 2407 OUTPUT:
1856 RETVAL 2408 RETVAL
1857 2409
1858void
1859throw (Coro::State self, SV *throw = &PL_sv_undef)
1860 PROTOTYPE: $;$
1861 CODE:
1862 SvREFCNT_dec (self->throw);
1863 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1864
1865# for async_pool speedup 2410# for async_pool speedup
1866void 2411void
1867_pool_1 (SV *cb) 2412_pool_1 (SV *cb)
1868 CODE: 2413 CODE:
1869{ 2414{
1870 struct coro *coro = SvSTATE (coro_current); 2415 struct coro *coro = SvSTATE (coro_current);
1871 HV *hv = (HV *)SvRV (coro_current); 2416 HV *hv = (HV *)SvRV (coro_current);
1872 AV *defav = GvAV (PL_defgv); 2417 AV *defav = GvAV (PL_defgv);
1873 SV *invoke = hv_delete (hv, strpair ("_invoke"), 0); 2418 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1874 AV *invoke_av; 2419 AV *invoke_av;
1875 int i, len; 2420 int i, len;
1876 2421
1877 if (!invoke) 2422 if (!invoke)
2423 {
2424 SV *old = PL_diehook;
2425 PL_diehook = 0;
2426 SvREFCNT_dec (old);
1878 croak ("\3async_pool terminate\2\n"); 2427 croak ("\3async_pool terminate\2\n");
2428 }
1879 2429
1880 SvREFCNT_dec (coro->saved_deffh); 2430 SvREFCNT_dec (coro->saved_deffh);
1881 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2431 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1882 2432
1883 hv_store (hv, "desc", sizeof ("desc") - 1, 2433 hv_store (hv, "desc", sizeof ("desc") - 1,
1884 newSVpvn (strpair ("[async_pool]")), 0); 2434 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1885 2435
1886 invoke_av = (AV *)SvRV (invoke); 2436 invoke_av = (AV *)SvRV (invoke);
1887 len = av_len (invoke_av); 2437 len = av_len (invoke_av);
1888 2438
1889 sv_setsv (cb, AvARRAY (invoke_av)[0]); 2439 sv_setsv (cb, AvARRAY (invoke_av)[0]);
1890 2440
1891 if (len > 0) 2441 if (len > 0)
1892 { 2442 {
1893 av_fill (defav, len - 1); 2443 av_fill (defav, len - 1);
1894 for (i = 0; i < len; ++i) 2444 for (i = 0; i < len; ++i)
1895 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2445 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
1896 } 2446 }
1897 2447
1898 SvREFCNT_dec (invoke); 2448 SvREFCNT_dec (invoke);
1899} 2449}
1900 2450
… …
1907 sv_setsv (cb, &PL_sv_undef); 2457 sv_setsv (cb, &PL_sv_undef);
1908 2458
1909 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2459 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
1910 coro->saved_deffh = 0; 2460 coro->saved_deffh = 0;
1911 2461
1912 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2462 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1913 || 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);
1914 croak ("\3async_pool terminate\2\n"); 2468 croak ("\3async_pool terminate\2\n");
2469 }
1915 2470
1916 av_clear (GvAV (PL_defgv)); 2471 av_clear (GvAV (PL_defgv));
1917 hv_store ((HV *)SvRV (coro_current), strpair ("desc"), 2472 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1918 newSVpvn (strpair ("[async_pool idle]")), 0); 2473 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1919 2474
1920 coro->prio = 0; 2475 coro->prio = 0;
1921 2476
1922 if (coro->cctx && (coro->cctx->flags & CC_TRACE)) 2477 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
1923 api_trace (coro_current, 0); 2478 api_trace (aTHX_ coro_current, 0);
1924 2479
1925 av_push (av_async_pool, newSVsv (coro_current)); 2480 av_push (av_async_pool, newSVsv (coro_current));
1926} 2481}
1927 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
1928 2531
1929MODULE = Coro::State PACKAGE = Coro::AIO 2532MODULE = Coro::State PACKAGE = Coro::AIO
1930 2533
1931SV * 2534void
1932_get_state () 2535_get_state (SV *self)
1933 CODE: 2536 PPCODE:
1934{ 2537{
1935 struct io_state *data; 2538 AV *defav = GvAV (PL_defgv);
1936 2539 AV *av = newAV ();
2540 int i;
1937 RETVAL = newSV (sizeof (struct io_state)); 2541 SV *data_sv = newSV (sizeof (struct io_state));
1938 data = (struct io_state *)SvPVX (RETVAL); 2542 struct io_state *data = (struct io_state *)SvPVX (data_sv);
1939 SvCUR_set (RETVAL, sizeof (struct io_state)); 2543 SvCUR_set (data_sv, sizeof (struct io_state));
1940 SvPOK_only (RETVAL); 2544 SvPOK_only (data_sv);
1941 2545
1942 data->errorno = errno; 2546 data->errorno = errno;
1943 data->laststype = PL_laststype; 2547 data->laststype = PL_laststype;
1944 data->laststatval = PL_laststatval; 2548 data->laststatval = PL_laststatval;
1945 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);
1946} 2561}
1947 OUTPUT:
1948 RETVAL
1949 2562
1950void 2563void
1951_set_state (char *data_) 2564_set_state (SV *state)
1952 PROTOTYPE: $ 2565 PROTOTYPE: $
1953 CODE: 2566 PPCODE:
1954{ 2567{
1955 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;
1956 2571
1957 errno = data->errorno; 2572 errno = data->errorno;
1958 PL_laststype = data->laststype; 2573 PL_laststype = data->laststype;
1959 PL_laststatval = data->laststatval; 2574 PL_laststatval = data->laststatval;
1960 PL_statcache = data->statcache; 2575 PL_statcache = data->statcache;
1961}
1962 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