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.181 by root, Wed Oct 3 17:37:33 2007 UTC vs.
Revision 1.254 by root, Fri Nov 7 20:27:47 2008 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2 2
3#define PERL_NO_GET_CONTEXT 3#define PERL_NO_GET_CONTEXT
4#define PERL_EXT
4 5
5#include "EXTERN.h" 6#include "EXTERN.h"
6#include "perl.h" 7#include "perl.h"
7#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h"
8 10
9#include "patchlevel.h" 11#include "patchlevel.h"
10 12
11#include <stdio.h> 13#include <stdio.h>
12#include <errno.h> 14#include <errno.h>
13#include <assert.h> 15#include <assert.h>
16
17#ifdef WIN32
18# undef setjmp
19# undef longjmp
20# undef _exit
21# define setjmp _setjmp // deep magic, don't ask
22#else
23# include <inttypes.h> /* most portable stdint.h */
24#endif
14 25
15#ifdef HAVE_MMAP 26#ifdef HAVE_MMAP
16# include <unistd.h> 27# include <unistd.h>
17# include <sys/mman.h> 28# include <sys/mman.h>
18# ifndef MAP_ANONYMOUS 29# ifndef MAP_ANONYMOUS
41#else 52#else
42# define REGISTER_STACK(cctx,start,end) 53# define REGISTER_STACK(cctx,start,end)
43#endif 54#endif
44 55
45/* the maximum number of idle cctx that will be pooled */ 56/* the maximum number of idle cctx that will be pooled */
46#define MAX_IDLE_CCTX 8 57static int cctx_max_idle = 4;
47 58
48#define PERL_VERSION_ATLEAST(a,b,c) \ 59#define PERL_VERSION_ATLEAST(a,b,c) \
49 (PERL_REVISION > (a) \ 60 (PERL_REVISION > (a) \
50 || (PERL_REVISION == (a) \ 61 || (PERL_REVISION == (a) \
51 && (PERL_VERSION > (b) \ 62 && (PERL_VERSION > (b) \
70# ifndef IS_PADCONST 81# ifndef IS_PADCONST
71# define IS_PADCONST(v) 0 82# define IS_PADCONST(v) 0
72# endif 83# endif
73#endif 84#endif
74 85
86/* 5.11 */
87#ifndef CxHASARGS
88# define CxHASARGS(cx) (cx)->blk_sub.hasargs
89#endif
90
91/* 5.10.0 */
92#ifndef SvREFCNT_inc_NN
93# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
94#endif
95
96/* 5.8.8 */
97#ifndef GV_NOTQUAL
98# define GV_NOTQUAL 0
99#endif
100#ifndef newSV
101# define newSV(l) NEWSV(0,l)
102#endif
103
75/* 5.8.7 */ 104/* 5.8.7 */
76#ifndef SvRV_set 105#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v) 106# define SvRV_set(s,v) SvRV(s) = (v)
78#endif 107#endif
79 108
98#define IN_DESTRUCT (PL_main_cv == Nullcv) 127#define IN_DESTRUCT (PL_main_cv == Nullcv)
99 128
100#if __GNUC__ >= 3 129#if __GNUC__ >= 3
101# define attribute(x) __attribute__(x) 130# define attribute(x) __attribute__(x)
102# define BARRIER __asm__ __volatile__ ("" : : : "memory") 131# define BARRIER __asm__ __volatile__ ("" : : : "memory")
132# define expect(expr,value) __builtin_expect ((expr),(value))
103#else 133#else
104# define attribute(x) 134# define attribute(x)
105# define BARRIER 135# define BARRIER
136# define expect(expr,value) (expr)
106#endif 137#endif
138
139#define expect_false(expr) expect ((expr) != 0, 0)
140#define expect_true(expr) expect ((expr) != 0, 1)
107 141
108#define NOINLINE attribute ((noinline)) 142#define NOINLINE attribute ((noinline))
109 143
110#include "CoroAPI.h" 144#include "CoroAPI.h"
111 145
112#ifdef USE_ITHREADS 146#ifdef USE_ITHREADS
113static perl_mutex coro_mutex; 147static perl_mutex coro_lock;
114# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 148# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0)
115# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 149# define UNLOCK do { MUTEX_UNLOCK (&coro_lock); } while (0)
116#else 150#else
117# define LOCK (void)0 151# define LOCK (void)0
118# define UNLOCK (void)0 152# define UNLOCK (void)0
119#endif 153#endif
120 154
121/* helper storage struct for Coro::AIO */ 155/* helper storage struct for Coro::AIO */
122struct io_state 156struct io_state
123{ 157{
158 AV *res;
124 int errorno; 159 int errorno;
125 I32 laststype; 160 I32 laststype;
126 int laststatval; 161 int laststatval;
127 Stat_t statcache; 162 Stat_t statcache;
128}; 163};
129 164
165static double (*nvtime)(); /* so why doesn't it take void? */
166
167static U32 cctx_gen;
130static size_t coro_stacksize = CORO_STACKSIZE; 168static size_t cctx_stacksize = CORO_STACKSIZE;
131static struct CoroAPI coroapi; 169static struct CoroAPI coroapi;
132static AV *main_mainstack; /* used to differentiate between $main and others */ 170static AV *main_mainstack; /* used to differentiate between $main and others */
133static JMPENV *main_top_env; 171static JMPENV *main_top_env;
134static HV *coro_state_stash, *coro_stash; 172static HV *coro_state_stash, *coro_stash;
135static SV *coro_mortal; /* will be freed after next transfer */ 173static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
136 174
137static GV *irsgv; /* $/ */ 175static GV *irsgv; /* $/ */
176static GV *stdoutgv; /* *STDOUT */
177static SV *rv_diehook;
178static SV *rv_warnhook;
179static HV *hv_sig; /* %SIG */
138 180
139/* async_pool helper stuff */ 181/* async_pool helper stuff */
140static SV *sv_pool_rss; 182static SV *sv_pool_rss;
141static SV *sv_pool_size; 183static SV *sv_pool_size;
142static AV *av_async_pool; 184static AV *av_async_pool;
185
186/* Coro::AnyEvent */
187static SV *sv_activity;
143 188
144static struct coro_cctx *cctx_first; 189static struct coro_cctx *cctx_first;
145static int cctx_count, cctx_idle; 190static int cctx_count, cctx_idle;
146 191
147enum { 192enum {
165 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 210 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
166 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 211 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
167 JMPENV *top_env; 212 JMPENV *top_env;
168 coro_context cctx; 213 coro_context cctx;
169 214
215 U32 gen;
170#if CORO_USE_VALGRIND 216#if CORO_USE_VALGRIND
171 int valgrind_id; 217 int valgrind_id;
172#endif 218#endif
173 unsigned char flags; 219 unsigned char flags;
174} coro_cctx; 220} coro_cctx;
178 CF_READY = 0x0002, /* coroutine is ready */ 224 CF_READY = 0x0002, /* coroutine is ready */
179 CF_NEW = 0x0004, /* has never been switched to */ 225 CF_NEW = 0x0004, /* has never been switched to */
180 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 226 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
181}; 227};
182 228
229/* the structure where most of the perl state is stored, overlaid on the cxstack */
230typedef struct {
231 SV *defsv;
232 AV *defav;
233 SV *errsv;
234 SV *irsgv;
235#define VAR(name,type) type name;
236# include "state.h"
237#undef VAR
238} perl_slots;
239
240#define SLOT_COUNT ((sizeof (perl_slots) + sizeof (PERL_CONTEXT) - 1) / sizeof (PERL_CONTEXT))
241
183/* this is a structure representing a perl-level coroutine */ 242/* this is a structure representing a perl-level coroutine */
184struct coro { 243struct coro {
185 /* the c coroutine allocated to this perl coroutine, if any */ 244 /* the c coroutine allocated to this perl coroutine, if any */
186 coro_cctx *cctx; 245 coro_cctx *cctx;
187 246
247 /* process data */
248 AV *mainstack;
249 perl_slots *slot; /* basically the saved sp */
250
188 /* data associated with this coroutine (initial args) */ 251 AV *args; /* data associated with this coroutine (initial args) */
189 AV *args; 252 int refcnt; /* coroutines are refcounted, yes */
190 int refcnt;
191 int flags; /* CF_ flags */ 253 int flags; /* CF_ flags */
192 254 HV *hv; /* the perl hash associated with this coro, if any */
193 /* optionally saved, might be zero */
194 AV *defav; /* @_ */
195 SV *defsv; /* $_ */
196 SV *errsv; /* $@ */
197 GV *deffh; /* default filehandle */
198 SV *irssv; /* $/ */
199 SV *irssv_sv; /* real $/ cache */
200
201#define VAR(name,type) type name;
202# include "state.h"
203#undef VAR
204 255
205 /* statistics */ 256 /* statistics */
206 int usecount; /* number of transfers to this coro */ 257 int usecount; /* number of transfers to this coro */
207 258
208 /* coro process data */ 259 /* coro process data */
209 int prio; 260 int prio;
210 //SV *throw; 261 SV *throw; /* exception to be thrown */
211 262
212 /* async_pool */ 263 /* async_pool */
213 GV *defoutgv; 264 SV *saved_deffh;
214 265
215 /* linked list */ 266 /* linked list */
216 struct coro *next, *prev; 267 struct coro *next, *prev;
217 HV *hv; /* the perl hash associated with this coro, if any */
218}; 268};
219 269
220typedef struct coro *Coro__State; 270typedef struct coro *Coro__State;
221typedef struct coro *Coro__State_or_hashref; 271typedef struct coro *Coro__State_or_hashref;
222 272
229#define PRIO_IDLE -3 279#define PRIO_IDLE -3
230#define PRIO_MIN -4 280#define PRIO_MIN -4
231 281
232/* for Coro.pm */ 282/* for Coro.pm */
233static SV *coro_current; 283static SV *coro_current;
284static SV *coro_readyhook;
234static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 285static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
235static int coro_nready; 286static int coro_nready;
236static struct coro *coro_first; 287static struct coro *coro_first;
237 288
238/** lowlevel stuff **********************************************************/ 289/** lowlevel stuff **********************************************************/
239 290
291static SV *
292coro_get_sv (pTHX_ const char *name, int create)
293{
294#if PERL_VERSION_ATLEAST (5,10,0)
295 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
296 get_sv (name, create);
297#endif
298 return get_sv (name, create);
299}
300
301static AV *
302coro_get_av (pTHX_ const char *name, int create)
303{
304#if PERL_VERSION_ATLEAST (5,10,0)
305 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
306 get_av (name, create);
307#endif
308 return get_av (name, create);
309}
310
311static HV *
312coro_get_hv (pTHX_ const char *name, int create)
313{
314#if PERL_VERSION_ATLEAST (5,10,0)
315 /* silence stupid and wrong 5.10 warning that I am unable to switch off */
316 get_hv (name, create);
317#endif
318 return get_hv (name, create);
319}
320
240static AV * 321static AV *
241coro_clone_padlist (pTHX_ CV *cv) 322coro_clone_padlist (pTHX_ CV *cv)
242{ 323{
243 AV *padlist = CvPADLIST (cv); 324 AV *padlist = CvPADLIST (cv);
244 AV *newpadlist, *newpad; 325 AV *newpadlist, *newpad;
245 326
246 newpadlist = newAV (); 327 newpadlist = newAV ();
247 AvREAL_off (newpadlist); 328 AvREAL_off (newpadlist);
248#if PERL_VERSION_ATLEAST (5,9,0) 329#if PERL_VERSION_ATLEAST (5,10,0)
249 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 330 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
250#else 331#else
251 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 332 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
252#endif 333#endif
253 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 334 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
254 --AvFILLp (padlist); 335 --AvFILLp (padlist);
255 336
256 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 337 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
257 av_store (newpadlist, 1, (SV *)newpad); 338 av_store (newpadlist, 1, (SV *)newpad);
258 339
259 return newpadlist; 340 return newpadlist;
260} 341}
261 342
291 372
292 /* casting is fun. */ 373 /* casting is fun. */
293 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 374 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
294 free_padlist (aTHX_ padlist); 375 free_padlist (aTHX_ padlist);
295 376
296 SvREFCNT_dec (av); 377 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
297 378
298 return 0; 379 return 0;
299} 380}
300 381
301#define PERL_MAGIC_coro PERL_MAGIC_ext 382#define CORO_MAGIC_type_cv PERL_MAGIC_ext
383#define CORO_MAGIC_type_state PERL_MAGIC_ext
302 384
303static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 385static MGVTBL coro_cv_vtbl = {
386 0, 0, 0, 0,
387 coro_cv_free
388};
304 389
305#define CORO_MAGIC(cv) \ 390#define CORO_MAGIC(sv, type) \
306 SvMAGIC (cv) \ 391 SvMAGIC (sv) \
307 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 392 ? SvMAGIC (sv)->mg_type == type \
308 ? SvMAGIC (cv) \ 393 ? SvMAGIC (sv) \
309 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 394 : mg_find (sv, type) \
310 : 0 395 : 0
396
397#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
398#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
311 399
312static struct coro * 400static struct coro *
313SvSTATE_ (pTHX_ SV *coro) 401SvSTATE_ (pTHX_ SV *coro)
314{ 402{
315 HV *stash; 403 HV *stash;
316 MAGIC *mg; 404 MAGIC *mg;
317 405
318 if (SvROK (coro)) 406 if (SvROK (coro))
319 coro = SvRV (coro); 407 coro = SvRV (coro);
320 408
321 if (SvTYPE (coro) != SVt_PVHV) 409 if (expect_false (SvTYPE (coro) != SVt_PVHV))
322 croak ("Coro::State object required"); 410 croak ("Coro::State object required");
323 411
324 stash = SvSTASH (coro); 412 stash = SvSTASH (coro);
325 if (stash != coro_stash && stash != coro_state_stash) 413 if (expect_false (stash != coro_stash && stash != coro_state_stash))
326 { 414 {
327 /* very slow, but rare, check */ 415 /* very slow, but rare, check */
328 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 416 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
329 croak ("Coro::State object required"); 417 croak ("Coro::State object required");
330 } 418 }
331 419
332 mg = CORO_MAGIC (coro); 420 mg = CORO_MAGIC_state (coro);
333 return (struct coro *)mg->mg_ptr; 421 return (struct coro *)mg->mg_ptr;
334} 422}
335 423
336#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 424#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
337 425
338/* the next two functions merely cache the padlists */ 426/* the next two functions merely cache the padlists */
339static void 427static void
340get_padlist (pTHX_ CV *cv) 428get_padlist (pTHX_ CV *cv)
341{ 429{
342 MAGIC *mg = CORO_MAGIC (cv); 430 MAGIC *mg = CORO_MAGIC_cv (cv);
343 AV *av; 431 AV *av;
344 432
345 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 433 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
346 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 434 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
347 else 435 else
348 { 436 {
349#if CORO_PREFER_PERL_FUNCTIONS 437#if CORO_PREFER_PERL_FUNCTIONS
350 /* this is probably cleaner, but also slower? */ 438 /* this is probably cleaner? but also slower! */
439 /* in practise, it seems to be less stable */
351 CV *cp = Perl_cv_clone (cv); 440 CV *cp = Perl_cv_clone (cv);
352 CvPADLIST (cv) = CvPADLIST (cp); 441 CvPADLIST (cv) = CvPADLIST (cp);
353 CvPADLIST (cp) = 0; 442 CvPADLIST (cp) = 0;
354 SvREFCNT_dec (cp); 443 SvREFCNT_dec (cp);
355#else 444#else
359} 448}
360 449
361static void 450static void
362put_padlist (pTHX_ CV *cv) 451put_padlist (pTHX_ CV *cv)
363{ 452{
364 MAGIC *mg = CORO_MAGIC (cv); 453 MAGIC *mg = CORO_MAGIC_cv (cv);
365 AV *av; 454 AV *av;
366 455
367 if (!mg) 456 if (expect_false (!mg))
368 { 457 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
369 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
370 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
371 mg->mg_virtual = &vtbl_coro;
372 mg->mg_obj = (SV *)newAV ();
373 }
374 458
375 av = (AV *)mg->mg_obj; 459 av = (AV *)mg->mg_obj;
376 460
377 if (AvFILLp (av) >= AvMAX (av)) 461 if (expect_false (AvFILLp (av) >= AvMAX (av)))
378 av_extend (av, AvMAX (av) + 1); 462 av_extend (av, AvMAX (av) + 1);
379 463
380 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 464 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
381} 465}
382 466
383/** load & save, init *******************************************************/ 467/** load & save, init *******************************************************/
384 468
385static void 469static void
386load_perl (pTHX_ Coro__State c) 470load_perl (pTHX_ Coro__State c)
387{ 471{
472 perl_slots *slot = c->slot;
473 c->slot = 0;
474
475 PL_mainstack = c->mainstack;
476
477 GvSV (PL_defgv) = slot->defsv;
478 GvAV (PL_defgv) = slot->defav;
479 GvSV (PL_errgv) = slot->errsv;
480 GvSV (irsgv) = slot->irsgv;
481
388#define VAR(name,type) PL_ ## name = c->name; 482 #define VAR(name,type) PL_ ## name = slot->name;
389# include "state.h" 483 # include "state.h"
390#undef VAR 484 #undef VAR
391
392 GvSV (PL_defgv) = c->defsv;
393 GvAV (PL_defgv) = c->defav;
394 GvSV (PL_errgv) = c->errsv;
395 PL_defoutgv = c->deffh;
396 PL_rs = c->irssv;
397 GvSV (irsgv) = c->irssv_sv;
398 485
399 { 486 {
400 dSP; 487 dSP;
488
401 CV *cv; 489 CV *cv;
402 490
403 /* now do the ugly restore mess */ 491 /* now do the ugly restore mess */
404 while ((cv = (CV *)POPs)) 492 while (expect_true (cv = (CV *)POPs))
405 { 493 {
406 put_padlist (aTHX_ cv); /* mark this padlist as available */ 494 put_padlist (aTHX_ cv); /* mark this padlist as available */
407 CvDEPTH (cv) = PTR2IV (POPs); 495 CvDEPTH (cv) = PTR2IV (POPs);
408 CvPADLIST (cv) = (AV *)POPs; 496 CvPADLIST (cv) = (AV *)POPs;
409 } 497 }
428 516
429 XPUSHs (Nullsv); 517 XPUSHs (Nullsv);
430 /* this loop was inspired by pp_caller */ 518 /* this loop was inspired by pp_caller */
431 for (;;) 519 for (;;)
432 { 520 {
433 while (cxix >= 0) 521 while (expect_true (cxix >= 0))
434 { 522 {
435 PERL_CONTEXT *cx = &ccstk[cxix--]; 523 PERL_CONTEXT *cx = &ccstk[cxix--];
436 524
437 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 525 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
438 { 526 {
439 CV *cv = cx->blk_sub.cv; 527 CV *cv = cx->blk_sub.cv;
440 528
441 if (CvDEPTH (cv)) 529 if (expect_true (CvDEPTH (cv)))
442 { 530 {
443 EXTEND (SP, 3); 531 EXTEND (SP, 3);
444 PUSHs ((SV *)CvPADLIST (cv)); 532 PUSHs ((SV *)CvPADLIST (cv));
445 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 533 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
446 PUSHs ((SV *)cv); 534 PUSHs ((SV *)cv);
447 535
448 CvDEPTH (cv) = 0; 536 CvDEPTH (cv) = 0;
449 get_padlist (aTHX_ cv); 537 get_padlist (aTHX_ cv);
450 } 538 }
451 } 539 }
452 } 540 }
453 541
454 if (top_si->si_type == PERLSI_MAIN) 542 if (expect_true (top_si->si_type == PERLSI_MAIN))
455 break; 543 break;
456 544
457 top_si = top_si->si_prev; 545 top_si = top_si->si_prev;
458 ccstk = top_si->si_cxstack; 546 ccstk = top_si->si_cxstack;
459 cxix = top_si->si_cxix; 547 cxix = top_si->si_cxix;
460 } 548 }
461 549
462 PUTBACK; 550 PUTBACK;
463 } 551 }
464 552
553 /* allocate some space on the context stack for our purposes */
554 /* we manually unroll here, as usually 2 slots is enough */
555 if (SLOT_COUNT >= 1) CXINC;
556 if (SLOT_COUNT >= 2) CXINC;
557 if (SLOT_COUNT >= 3) CXINC;
558 {
559 int i;
560 for (i = 3; i < SLOT_COUNT; ++i)
561 CXINC;
562 }
563 cxstack_ix -= SLOT_COUNT; /* undo allocation */
564
565 c->mainstack = PL_mainstack;
566
567 {
568 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
569
465 c->defav = GvAV (PL_defgv); 570 slot->defav = GvAV (PL_defgv);
466 c->defsv = DEFSV; 571 slot->defsv = DEFSV;
467 c->errsv = ERRSV; 572 slot->errsv = ERRSV;
468 c->deffh = PL_defoutgv;
469 c->irssv = PL_rs;
470 c->irssv_sv = GvSV (irsgv); 573 slot->irsgv = GvSV (irsgv);
471 574
472#define VAR(name,type)c->name = PL_ ## name; 575 #define VAR(name,type) slot->name = PL_ ## name;
473# include "state.h" 576 # include "state.h"
474#undef VAR 577 #undef VAR
578 }
475} 579}
476 580
477/* 581/*
478 * allocate various perl stacks. This is an exact copy 582 * allocate various perl stacks. This is an exact copy
479 * of perl.c:init_stacks, except that it uses less memory 583 * of perl.c:init_stacks, except that it uses less memory
484# define coro_init_stacks init_stacks 588# define coro_init_stacks init_stacks
485#else 589#else
486static void 590static void
487coro_init_stacks (pTHX) 591coro_init_stacks (pTHX)
488{ 592{
489 PL_curstackinfo = new_stackinfo(64, 6); 593 PL_curstackinfo = new_stackinfo(32, 8);
490 PL_curstackinfo->si_type = PERLSI_MAIN; 594 PL_curstackinfo->si_type = PERLSI_MAIN;
491 PL_curstack = PL_curstackinfo->si_stack; 595 PL_curstack = PL_curstackinfo->si_stack;
492 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 596 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
493 597
494 PL_stack_base = AvARRAY(PL_curstack); 598 PL_stack_base = AvARRAY(PL_curstack);
495 PL_stack_sp = PL_stack_base; 599 PL_stack_sp = PL_stack_base;
496 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 600 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
497 601
498 New(50,PL_tmps_stack,64,SV*); 602 New(50,PL_tmps_stack,32,SV*);
499 PL_tmps_floor = -1; 603 PL_tmps_floor = -1;
500 PL_tmps_ix = -1; 604 PL_tmps_ix = -1;
501 PL_tmps_max = 64; 605 PL_tmps_max = 32;
502 606
503 New(54,PL_markstack,16,I32); 607 New(54,PL_markstack,16,I32);
504 PL_markstack_ptr = PL_markstack; 608 PL_markstack_ptr = PL_markstack;
505 PL_markstack_max = PL_markstack + 16; 609 PL_markstack_max = PL_markstack + 16;
506 610
507#ifdef SET_MARK_OFFSET 611#ifdef SET_MARK_OFFSET
508 SET_MARK_OFFSET; 612 SET_MARK_OFFSET;
509#endif 613#endif
510 614
511 New(54,PL_scopestack,16,I32); 615 New(54,PL_scopestack,8,I32);
512 PL_scopestack_ix = 0; 616 PL_scopestack_ix = 0;
513 PL_scopestack_max = 16; 617 PL_scopestack_max = 8;
514 618
515 New(54,PL_savestack,64,ANY); 619 New(54,PL_savestack,24,ANY);
516 PL_savestack_ix = 0; 620 PL_savestack_ix = 0;
517 PL_savestack_max = 64; 621 PL_savestack_max = 24;
518 622
519#if !PERL_VERSION_ATLEAST (5,9,0) 623#if !PERL_VERSION_ATLEAST (5,10,0)
520 New(54,PL_retstack,4,OP*); 624 New(54,PL_retstack,4,OP*);
521 PL_retstack_ix = 0; 625 PL_retstack_ix = 0;
522 PL_retstack_max = 4; 626 PL_retstack_max = 4;
523#endif 627#endif
524} 628}
526 630
527/* 631/*
528 * destroy the stacks, the callchain etc... 632 * destroy the stacks, the callchain etc...
529 */ 633 */
530static void 634static void
531coro_destroy_stacks (pTHX) 635coro_destruct_stacks (pTHX)
532{ 636{
533 while (PL_curstackinfo->si_next) 637 while (PL_curstackinfo->si_next)
534 PL_curstackinfo = PL_curstackinfo->si_next; 638 PL_curstackinfo = PL_curstackinfo->si_next;
535 639
536 while (PL_curstackinfo) 640 while (PL_curstackinfo)
547 651
548 Safefree (PL_tmps_stack); 652 Safefree (PL_tmps_stack);
549 Safefree (PL_markstack); 653 Safefree (PL_markstack);
550 Safefree (PL_scopestack); 654 Safefree (PL_scopestack);
551 Safefree (PL_savestack); 655 Safefree (PL_savestack);
552#if !PERL_VERSION_ATLEAST (5,9,0) 656#if !PERL_VERSION_ATLEAST (5,10,0)
553 Safefree (PL_retstack); 657 Safefree (PL_retstack);
554#endif 658#endif
555} 659}
556 660
557static size_t 661static size_t
558coro_rss (pTHX_ struct coro *coro) 662coro_rss (pTHX_ struct coro *coro)
559{ 663{
560 size_t rss = sizeof (coro); 664 size_t rss = sizeof (*coro);
561 665
562 if (coro->mainstack) 666 if (coro->mainstack)
563 { 667 {
668 perl_slots tmp_slot;
669 perl_slots *slot;
670
564 if (coro->flags & CF_RUNNING) 671 if (coro->flags & CF_RUNNING)
565 { 672 {
673 slot = &tmp_slot;
674
566 #define VAR(name,type)coro->name = PL_ ## name; 675 #define VAR(name,type) slot->name = PL_ ## name;
567 # include "state.h" 676 # include "state.h"
568 #undef VAR 677 #undef VAR
569 } 678 }
679 else
680 slot = coro->slot;
570 681
682 if (slot)
683 {
571 rss += sizeof (coro->curstackinfo); 684 rss += sizeof (slot->curstackinfo);
572 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
573 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 685 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
574 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 686 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
575 rss += coro->tmps_max * sizeof (SV *); 687 rss += slot->tmps_max * sizeof (SV *);
576 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 688 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
577 rss += coro->scopestack_max * sizeof (I32); 689 rss += slot->scopestack_max * sizeof (I32);
578 rss += coro->savestack_max * sizeof (ANY); 690 rss += slot->savestack_max * sizeof (ANY);
579 691
580#if !PERL_VERSION_ATLEAST (5,9,0) 692#if !PERL_VERSION_ATLEAST (5,10,0)
581 rss += coro->retstack_max * sizeof (OP *); 693 rss += slot->retstack_max * sizeof (OP *);
582#endif 694#endif
695 }
583 } 696 }
584 697
585 return rss; 698 return rss;
586} 699}
587 700
588/** coroutine stack handling ************************************************/ 701/** coroutine stack handling ************************************************/
702
703static int (*orig_sigelem_get) (pTHX_ SV *sv, MAGIC *mg);
704static int (*orig_sigelem_set) (pTHX_ SV *sv, MAGIC *mg);
705static int (*orig_sigelem_clr) (pTHX_ SV *sv, MAGIC *mg);
706
707/* apparently < 5.8.8 */
708#ifndef MgPV_nolen_const
709#define MgPV_nolen_const(mg) (((((int)(mg)->mg_len)) == HEf_SVKEY) ? \
710 SvPV_nolen((SV*)((mg)->mg_ptr)) : \
711 (const char*)(mg)->mg_ptr)
712#endif
713
714/*
715 * This overrides the default magic get method of %SIG elements.
716 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
717 * and instead of tryign to save and restore the hash elements, we just provide
718 * readback here.
719 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
720 * not expecting this to actually change the hook. This is a potential problem
721 * when a schedule happens then, but we ignore this.
722 */
723static int
724coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
725{
726 const char *s = MgPV_nolen_const (mg);
727
728 if (*s == '_')
729 {
730 SV **svp = 0;
731
732 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
733 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
734
735 if (svp)
736 {
737 sv_setsv (sv, *svp ? *svp : &PL_sv_undef);
738 return 0;
739 }
740 }
741
742 return orig_sigelem_get ? orig_sigelem_get (aTHX_ sv, mg) : 0;
743}
744
745static int
746coro_sigelem_clr (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 *old = *svp;
760 *svp = 0;
761 SvREFCNT_dec (old);
762 return 0;
763 }
764 }
765
766 return orig_sigelem_clr ? orig_sigelem_clr (aTHX_ sv, mg) : 0;
767}
768
769static int
770coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
771{
772 const char *s = MgPV_nolen_const (mg);
773
774 if (*s == '_')
775 {
776 SV **svp = 0;
777
778 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
779 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
780
781 if (svp)
782 {
783 SV *old = *svp;
784 *svp = newSVsv (sv);
785 SvREFCNT_dec (old);
786 return 0;
787 }
788 }
789
790 return orig_sigelem_set ? orig_sigelem_set (aTHX_ sv, mg) : 0;
791}
589 792
590static void 793static void
591coro_setup (pTHX_ struct coro *coro) 794coro_setup (pTHX_ struct coro *coro)
592{ 795{
593 /* 796 /*
598 PL_runops = RUNOPS_DEFAULT; 801 PL_runops = RUNOPS_DEFAULT;
599 PL_curcop = &PL_compiling; 802 PL_curcop = &PL_compiling;
600 PL_in_eval = EVAL_NULL; 803 PL_in_eval = EVAL_NULL;
601 PL_comppad = 0; 804 PL_comppad = 0;
602 PL_curpm = 0; 805 PL_curpm = 0;
806 PL_curpad = 0;
603 PL_localizing = 0; 807 PL_localizing = 0;
604 PL_dirty = 0; 808 PL_dirty = 0;
605 PL_restartop = 0; 809 PL_restartop = 0;
810#if PERL_VERSION_ATLEAST (5,10,0)
811 PL_parser = 0;
812#endif
813
814 /* recreate the die/warn hooks */
815 PL_diehook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__DIE__" , sizeof ("__DIE__" ) - 1, 1), rv_diehook );
816 PL_warnhook = 0; SvSetMagicSV (*hv_fetch (hv_sig, "__WARN__", sizeof ("__WARN__") - 1, 1), rv_warnhook);
606 817
607 GvSV (PL_defgv) = NEWSV (0, 0); 818 GvSV (PL_defgv) = newSV (0);
608 GvAV (PL_defgv) = coro->args; coro->args = 0; 819 GvAV (PL_defgv) = coro->args; coro->args = 0;
609 GvSV (PL_errgv) = NEWSV (0, 0); 820 GvSV (PL_errgv) = newSV (0);
610 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 821 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
611 PL_rs = newSVsv (GvSV (irsgv)); 822 PL_rs = newSVsv (GvSV (irsgv));
612 823 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
613 {
614 IO *io = newIO ();
615 PL_defoutgv = newGVgen ("Coro");
616 GvIOp(PL_defoutgv) = io;
617 IoTYPE (io) = IoTYPE_WRONLY;
618 IoOFP (io) = IoIFP (io) = PerlIO_stdout ();
619 IoFLAGS (io) |= IOf_FLUSH;
620 }
621 824
622 { 825 {
623 dSP; 826 dSP;
624 LOGOP myop; 827 LOGOP myop;
625 828
626 Zero (&myop, 1, LOGOP); 829 Zero (&myop, 1, LOGOP);
627 myop.op_next = Nullop; 830 myop.op_next = Nullop;
628 myop.op_flags = OPf_WANT_VOID; 831 myop.op_flags = OPf_WANT_VOID;
629 832
630 PUSHMARK (SP); 833 PUSHMARK (SP);
631 XPUSHs (av_shift (GvAV (PL_defgv))); 834 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
632 PUTBACK; 835 PUTBACK;
633 PL_op = (OP *)&myop; 836 PL_op = (OP *)&myop;
634 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 837 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
635 SPAGAIN; 838 SPAGAIN;
636 } 839 }
637 840
638 ENTER; /* necessary e.g. for dounwind */ 841 /* this newly created coroutine might be run on an existing cctx which most
842 * likely was suspended in set_stacklevel, called from entersub.
843 * set_stacklevl doesn't do anything on return, but entersub does LEAVE,
844 * so we ENTER here for symmetry
845 */
846 ENTER;
639} 847}
640 848
641static void 849static void
642coro_destroy (pTHX_ struct coro *coro) 850coro_destruct (pTHX_ struct coro *coro)
643{ 851{
644 if (!IN_DESTRUCT) 852 if (!IN_DESTRUCT)
645 { 853 {
646 /* restore all saved variables and stuff */ 854 /* restore all saved variables and stuff */
647 LEAVE_SCOPE (0); 855 LEAVE_SCOPE (0);
663 SvREFCNT_dec (GvSV (PL_errgv)); 871 SvREFCNT_dec (GvSV (PL_errgv));
664 SvREFCNT_dec (PL_defoutgv); 872 SvREFCNT_dec (PL_defoutgv);
665 SvREFCNT_dec (PL_rs); 873 SvREFCNT_dec (PL_rs);
666 SvREFCNT_dec (GvSV (irsgv)); 874 SvREFCNT_dec (GvSV (irsgv));
667 875
876 SvREFCNT_dec (PL_diehook);
877 SvREFCNT_dec (PL_warnhook);
878
668 SvREFCNT_dec (coro->defoutgv); 879 SvREFCNT_dec (coro->saved_deffh);
669 //SvREFCNT_dec (coro->throw); 880 SvREFCNT_dec (coro->throw);
670 881
671 coro_destroy_stacks (aTHX); 882 coro_destruct_stacks (aTHX);
672} 883}
673 884
674static void 885static void
675free_coro_mortal (pTHX) 886free_coro_mortal (pTHX)
676{ 887{
677 if (coro_mortal) 888 if (expect_true (coro_mortal))
678 { 889 {
679 SvREFCNT_dec (coro_mortal); 890 SvREFCNT_dec (coro_mortal);
680 coro_mortal = 0; 891 coro_mortal = 0;
681 } 892 }
682} 893}
711 bot = PL_stack_base + cx->blk_oldsp + 1; 922 bot = PL_stack_base + cx->blk_oldsp + 1;
712 top = cx->blk_gimme == G_ARRAY ? SP + 1 923 top = cx->blk_gimme == G_ARRAY ? SP + 1
713 : cx->blk_gimme == G_SCALAR ? bot + 1 924 : cx->blk_gimme == G_SCALAR ? bot + 1
714 : bot; 925 : bot;
715 926
927 av_extend (av, top - bot);
716 while (bot < top) 928 while (bot < top)
717 av_push (av, SvREFCNT_inc (*bot++)); 929 av_push (av, SvREFCNT_inc_NN (*bot++));
718 930
719 PL_runops = RUNOPS_DEFAULT; 931 PL_runops = RUNOPS_DEFAULT;
720 ENTER; 932 ENTER;
721 SAVETMPS; 933 SAVETMPS;
722 EXTEND (SP, 3); 934 EXTEND (SP, 3);
760 SAVETMPS; 972 SAVETMPS;
761 EXTEND (SP, 3); 973 EXTEND (SP, 3);
762 PUSHMARK (SP); 974 PUSHMARK (SP);
763 PUSHs (&PL_sv_yes); 975 PUSHs (&PL_sv_yes);
764 PUSHs (fullname); 976 PUSHs (fullname);
765 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 977 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
766 PUTBACK; 978 PUTBACK;
767 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 979 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
768 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 980 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
769 SPAGAIN; 981 SPAGAIN;
770 FREETMPS; 982 FREETMPS;
806 1018
807/* inject a fake call to Coro::State::_cctx_init into the execution */ 1019/* inject a fake call to Coro::State::_cctx_init into the execution */
808/* _cctx_init should be careful, as it could be called at almost any time */ 1020/* _cctx_init should be careful, as it could be called at almost any time */
809/* during execution of a perl program */ 1021/* during execution of a perl program */
810static void NOINLINE 1022static void NOINLINE
811prepare_cctx (pTHX_ coro_cctx *cctx) 1023cctx_prepare (pTHX_ coro_cctx *cctx)
812{ 1024{
813 dSP; 1025 dSP;
814 LOGOP myop; 1026 LOGOP myop;
815 1027
816 PL_top_env = &PL_start_env; 1028 PL_top_env = &PL_start_env;
834 1046
835/* 1047/*
836 * this is a _very_ stripped down perl interpreter ;) 1048 * this is a _very_ stripped down perl interpreter ;)
837 */ 1049 */
838static void 1050static void
839coro_run (void *arg) 1051cctx_run (void *arg)
840{ 1052{
841 dTHX; 1053 dTHX;
842 1054
843 /* coro_run is the alternative tail of transfer(), so unlock here. */ 1055 /* cctx_run is the alternative tail of transfer(), so unlock here. */
844 UNLOCK; 1056 UNLOCK;
845 1057
846 /* we now skip the entersub that lead to transfer() */ 1058 /* we now skip the entersub that lead to transfer() */
847 PL_op = PL_op->op_next; 1059 PL_op = PL_op->op_next;
848 1060
849 /* inject a fake subroutine call to cctx_init */ 1061 /* inject a fake subroutine call to cctx_init */
850 prepare_cctx (aTHX_ (coro_cctx *)arg); 1062 cctx_prepare (aTHX_ (coro_cctx *)arg);
851 1063
852 /* somebody or something will hit me for both perl_run and PL_restartop */ 1064 /* somebody or something will hit me for both perl_run and PL_restartop */
853 PL_restartop = PL_op; 1065 PL_restartop = PL_op;
854 perl_run (PL_curinterp); 1066 perl_run (PL_curinterp);
855 1067
870 coro_cctx *cctx; 1082 coro_cctx *cctx;
871 void *stack_start; 1083 void *stack_start;
872 size_t stack_size; 1084 size_t stack_size;
873 1085
874 ++cctx_count; 1086 ++cctx_count;
875
876 Newz (0, cctx, 1, coro_cctx); 1087 Newz (0, cctx, 1, coro_cctx);
877 1088
1089 cctx->gen = cctx_gen;
1090
878#if HAVE_MMAP 1091#if HAVE_MMAP
879
880 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1092 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
881 /* mmap supposedly does allocate-on-write for us */ 1093 /* mmap supposedly does allocate-on-write for us */
882 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1094 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
883 1095
884 if (cctx->sptr != (void *)-1) 1096 if (cctx->sptr != (void *)-1)
885 { 1097 {
891 cctx->flags |= CC_MAPPED; 1103 cctx->flags |= CC_MAPPED;
892 } 1104 }
893 else 1105 else
894#endif 1106#endif
895 { 1107 {
896 cctx->ssize = coro_stacksize * (long)sizeof (long); 1108 cctx->ssize = cctx_stacksize * (long)sizeof (long);
897 New (0, cctx->sptr, coro_stacksize, long); 1109 New (0, cctx->sptr, cctx_stacksize, long);
898 1110
899 if (!cctx->sptr) 1111 if (!cctx->sptr)
900 { 1112 {
901 perror ("FATAL: unable to allocate stack for coroutine"); 1113 perror ("FATAL: unable to allocate stack for coroutine");
902 _exit (EXIT_FAILURE); 1114 _exit (EXIT_FAILURE);
905 stack_start = cctx->sptr; 1117 stack_start = cctx->sptr;
906 stack_size = cctx->ssize; 1118 stack_size = cctx->ssize;
907 } 1119 }
908 1120
909 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1121 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
910 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size); 1122 coro_create (&cctx->cctx, cctx_run, (void *)cctx, stack_start, stack_size);
911 1123
912 return cctx; 1124 return cctx;
913} 1125}
914 1126
915static void 1127static void
917{ 1129{
918 if (!cctx) 1130 if (!cctx)
919 return; 1131 return;
920 1132
921 --cctx_count; 1133 --cctx_count;
1134 coro_destroy (&cctx->cctx);
922 1135
1136 /* coro_transfer creates new, empty cctx's */
1137 if (cctx->sptr)
1138 {
923#if CORO_USE_VALGRIND 1139#if CORO_USE_VALGRIND
924 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1140 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
925#endif 1141#endif
926 1142
927#if HAVE_MMAP 1143#if HAVE_MMAP
928 if (cctx->flags & CC_MAPPED) 1144 if (cctx->flags & CC_MAPPED)
929 munmap (cctx->sptr, cctx->ssize); 1145 munmap (cctx->sptr, cctx->ssize);
930 else 1146 else
931#endif 1147#endif
932 Safefree (cctx->sptr); 1148 Safefree (cctx->sptr);
1149 }
933 1150
934 Safefree (cctx); 1151 Safefree (cctx);
935} 1152}
1153
1154/* wether this cctx should be destructed */
1155#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
936 1156
937static coro_cctx * 1157static coro_cctx *
938cctx_get (pTHX) 1158cctx_get (pTHX)
939{ 1159{
940 while (cctx_first) 1160 while (expect_true (cctx_first))
941 { 1161 {
942 coro_cctx *cctx = cctx_first; 1162 coro_cctx *cctx = cctx_first;
943 cctx_first = cctx->next; 1163 cctx_first = cctx->next;
944 --cctx_idle; 1164 --cctx_idle;
945 1165
946 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1166 if (expect_true (!CCTX_EXPIRED (cctx)))
947 return cctx; 1167 return cctx;
948 1168
949 cctx_destroy (cctx); 1169 cctx_destroy (cctx);
950 } 1170 }
951 1171
953} 1173}
954 1174
955static void 1175static void
956cctx_put (coro_cctx *cctx) 1176cctx_put (coro_cctx *cctx)
957{ 1177{
1178 assert (("cctx_put called on non-initialised cctx", cctx->sptr));
1179
958 /* free another cctx if overlimit */ 1180 /* free another cctx if overlimit */
959 if (cctx_idle >= MAX_IDLE_CCTX) 1181 if (expect_false (cctx_idle >= cctx_max_idle))
960 { 1182 {
961 coro_cctx *first = cctx_first; 1183 coro_cctx *first = cctx_first;
962 cctx_first = first->next; 1184 cctx_first = first->next;
963 --cctx_idle; 1185 --cctx_idle;
964 1186
970 cctx_first = cctx; 1192 cctx_first = cctx;
971} 1193}
972 1194
973/** coroutine switching *****************************************************/ 1195/** coroutine switching *****************************************************/
974 1196
975static void NOINLINE 1197static void
976transfer_check (pTHX_ struct coro *prev, struct coro *next) 1198transfer_check (pTHX_ struct coro *prev, struct coro *next)
977{ 1199{
978 if (prev != next) 1200 if (expect_true (prev != next))
979 { 1201 {
980 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1202 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
981 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 1203 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
982 1204
983 if (next->flags & CF_RUNNING) 1205 if (expect_false (next->flags & CF_RUNNING))
984 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 1206 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
985 1207
986 if (next->flags & CF_DESTROYED) 1208 if (expect_false (next->flags & CF_DESTROYED))
987 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 1209 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
988 1210
1211#if !PERL_VERSION_ATLEAST (5,10,0)
989 if (PL_lex_state != LEX_NOTPARSING) 1212 if (expect_false (PL_lex_state != LEX_NOTPARSING))
990 croak ("Coro::State::transfer called while parsing, but this is not supported"); 1213 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1214#endif
991 } 1215 }
992} 1216}
993 1217
994/* always use the TRANSFER macro */ 1218/* always use the TRANSFER macro */
995static void NOINLINE 1219static void NOINLINE
996transfer (pTHX_ struct coro *prev, struct coro *next) 1220transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
997{ 1221{
998 dSTACKLEVEL; 1222 dSTACKLEVEL;
999 1223
1000 /* sometimes transfer is only called to set idle_sp */ 1224 /* sometimes transfer is only called to set idle_sp */
1001 if (!next) 1225 if (expect_false (!next))
1002 { 1226 {
1003 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1227 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1004 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1228 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1005 } 1229 }
1006 else if (prev != next) 1230 else if (expect_true (prev != next))
1007 { 1231 {
1232 static volatile int has_throw;
1008 coro_cctx *prev__cctx; 1233 coro_cctx *prev__cctx;
1009 1234
1010 if (prev->flags & CF_NEW) 1235 if (expect_false (prev->flags & CF_NEW))
1011 { 1236 {
1012 /* create a new empty context */ 1237 /* create a new empty/source context */
1238 ++cctx_count;
1013 Newz (0, prev->cctx, 1, coro_cctx); 1239 New (0, prev->cctx, 1, coro_cctx);
1240 prev->cctx->sptr = 0;
1241 coro_create (&prev->cctx->cctx, 0, 0, 0, 0);
1242
1014 prev->flags &= ~CF_NEW; 1243 prev->flags &= ~CF_NEW;
1015 prev->flags |= CF_RUNNING; 1244 prev->flags |= CF_RUNNING;
1016 } 1245 }
1017 1246
1018 prev->flags &= ~CF_RUNNING; 1247 prev->flags &= ~CF_RUNNING;
1019 next->flags |= CF_RUNNING; 1248 next->flags |= CF_RUNNING;
1020 1249
1021 LOCK; 1250 LOCK;
1022 1251
1252 /* first get rid of the old state */
1253 save_perl (aTHX_ prev);
1254
1023 if (next->flags & CF_NEW) 1255 if (expect_false (next->flags & CF_NEW))
1024 { 1256 {
1025 /* need to start coroutine */ 1257 /* need to start coroutine */
1026 next->flags &= ~CF_NEW; 1258 next->flags &= ~CF_NEW;
1027 /* first get rid of the old state */
1028 save_perl (aTHX_ prev);
1029 /* setup coroutine call */ 1259 /* setup coroutine call */
1030 coro_setup (aTHX_ next); 1260 coro_setup (aTHX_ next);
1031 } 1261 }
1032 else 1262 else
1033 {
1034 /* coroutine already started */
1035 save_perl (aTHX_ prev);
1036 load_perl (aTHX_ next); 1263 load_perl (aTHX_ next);
1037 }
1038 1264
1039 prev__cctx = prev->cctx; 1265 prev__cctx = prev->cctx;
1040 1266
1041 /* possibly "free" the cctx */ 1267 /* possibly "free" the cctx */
1042 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1268 if (expect_true (
1269 prev__cctx->idle_sp == STACKLEVEL
1270 && !(prev__cctx->flags & CC_TRACE)
1271 && !force_cctx
1272 ))
1043 { 1273 {
1044 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1274 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1045 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1275 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1046 1276
1047 prev->cctx = 0; 1277 prev->cctx = 0;
1048 1278
1279 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1280 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1281 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1282 if (!next->cctx)
1283 next->cctx = cctx_get (aTHX);
1284
1049 cctx_put (prev__cctx); 1285 cctx_put (prev__cctx);
1050 } 1286 }
1051 1287
1052 ++next->usecount; 1288 ++next->usecount;
1053 1289
1054 if (!next->cctx) 1290 if (expect_true (!next->cctx))
1055 next->cctx = cctx_get (aTHX); 1291 next->cctx = cctx_get (aTHX);
1056 1292
1293 has_throw = !!next->throw;
1294
1057 if (prev__cctx != next->cctx) 1295 if (expect_false (prev__cctx != next->cctx))
1058 { 1296 {
1059 prev__cctx->top_env = PL_top_env; 1297 prev__cctx->top_env = PL_top_env;
1060 PL_top_env = next->cctx->top_env; 1298 PL_top_env = next->cctx->top_env;
1061 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1299 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1062 } 1300 }
1063 1301
1064 free_coro_mortal (aTHX); 1302 free_coro_mortal (aTHX);
1065 UNLOCK; 1303 UNLOCK;
1304
1305 if (expect_false (has_throw))
1306 {
1307 struct coro *coro = SvSTATE (coro_current);
1308
1309 if (coro->throw)
1310 {
1311 SV *exception = coro->throw;
1312 coro->throw = 0;
1313 sv_setsv (ERRSV, exception);
1314 croak (0);
1315 }
1316 }
1066 } 1317 }
1067} 1318}
1068 1319
1069struct transfer_args 1320struct transfer_args
1070{ 1321{
1071 struct coro *prev, *next; 1322 struct coro *prev, *next;
1072}; 1323};
1073 1324
1074#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1325#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1075#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1326#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1076 1327
1077/** high level stuff ********************************************************/ 1328/** high level stuff ********************************************************/
1078 1329
1079static int 1330static int
1103 croak ("FATAL: tried to destroy currently running coroutine"); 1354 croak ("FATAL: tried to destroy currently running coroutine");
1104 1355
1105 save_perl (aTHX_ &temp); 1356 save_perl (aTHX_ &temp);
1106 load_perl (aTHX_ coro); 1357 load_perl (aTHX_ coro);
1107 1358
1108 coro_destroy (aTHX_ coro); 1359 coro_destruct (aTHX_ coro);
1109 1360
1110 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1361 load_perl (aTHX_ &temp);
1111 1362
1112 coro->mainstack = 0; 1363 coro->slot = 0;
1113 } 1364 }
1114 1365
1115 cctx_destroy (coro->cctx); 1366 cctx_destroy (coro->cctx);
1116 SvREFCNT_dec (coro->args); 1367 SvREFCNT_dec (coro->args);
1117 1368
1173{ 1424{
1174 dTHX; 1425 dTHX;
1175 struct transfer_args ta; 1426 struct transfer_args ta;
1176 1427
1177 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1428 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1178 TRANSFER (ta); 1429 TRANSFER (ta, 1);
1179} 1430}
1180 1431
1181/** Coro ********************************************************************/ 1432/** Coro ********************************************************************/
1182 1433
1183static void 1434static void
1185{ 1436{
1186 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 1437 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
1187} 1438}
1188 1439
1189static SV * 1440static SV *
1190coro_deq (pTHX_ int min_prio) 1441coro_deq (pTHX)
1191{ 1442{
1192 int prio = PRIO_MAX - PRIO_MIN; 1443 int prio;
1193 1444
1194 min_prio -= PRIO_MIN;
1195 if (min_prio < 0)
1196 min_prio = 0;
1197
1198 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1445 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1199 if (AvFILLp (coro_ready [prio]) >= 0) 1446 if (AvFILLp (coro_ready [prio]) >= 0)
1200 return av_shift (coro_ready [prio]); 1447 return av_shift (coro_ready [prio]);
1201 1448
1202 return 0; 1449 return 0;
1203} 1450}
1205static int 1452static int
1206api_ready (SV *coro_sv) 1453api_ready (SV *coro_sv)
1207{ 1454{
1208 dTHX; 1455 dTHX;
1209 struct coro *coro; 1456 struct coro *coro;
1457 SV *sv_hook;
1458 void (*xs_hook)(void);
1210 1459
1211 if (SvROK (coro_sv)) 1460 if (SvROK (coro_sv))
1212 coro_sv = SvRV (coro_sv); 1461 coro_sv = SvRV (coro_sv);
1213 1462
1214 coro = SvSTATE (coro_sv); 1463 coro = SvSTATE (coro_sv);
1217 return 0; 1466 return 0;
1218 1467
1219 coro->flags |= CF_READY; 1468 coro->flags |= CF_READY;
1220 1469
1221 LOCK; 1470 LOCK;
1471
1472 sv_hook = coro_nready ? 0 : coro_readyhook;
1473 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1474
1222 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1475 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1223 ++coro_nready; 1476 ++coro_nready;
1477
1224 UNLOCK; 1478 UNLOCK;
1479
1480 if (sv_hook)
1481 {
1482 dSP;
1483
1484 ENTER;
1485 SAVETMPS;
1486
1487 PUSHMARK (SP);
1488 PUTBACK;
1489 call_sv (sv_hook, G_DISCARD);
1490 SPAGAIN;
1491
1492 FREETMPS;
1493 LEAVE;
1494 }
1495
1496 if (xs_hook)
1497 xs_hook ();
1225 1498
1226 return 1; 1499 return 1;
1227} 1500}
1228 1501
1229static int 1502static int
1239 SV *prev_sv, *next_sv; 1512 SV *prev_sv, *next_sv;
1240 1513
1241 for (;;) 1514 for (;;)
1242 { 1515 {
1243 LOCK; 1516 LOCK;
1244 next_sv = coro_deq (aTHX_ PRIO_MIN); 1517 next_sv = coro_deq (aTHX);
1245 1518
1246 /* nothing to schedule: call the idle handler */ 1519 /* nothing to schedule: call the idle handler */
1247 if (!next_sv) 1520 if (expect_false (!next_sv))
1248 { 1521 {
1249 dSP; 1522 dSP;
1250 UNLOCK; 1523 UNLOCK;
1251 1524
1252 ENTER; 1525 ENTER;
1253 SAVETMPS; 1526 SAVETMPS;
1254 1527
1255 PUSHMARK (SP); 1528 PUSHMARK (SP);
1256 PUTBACK; 1529 PUTBACK;
1257 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1530 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1531 SPAGAIN;
1258 1532
1259 FREETMPS; 1533 FREETMPS;
1260 LEAVE; 1534 LEAVE;
1261 continue; 1535 continue;
1262 } 1536 }
1263 1537
1264 ta->next = SvSTATE (next_sv); 1538 ta->next = SvSTATE (next_sv);
1265 1539
1266 /* cannot transfer to destroyed coros, skip and look for next */ 1540 /* cannot transfer to destroyed coros, skip and look for next */
1267 if (ta->next->flags & CF_DESTROYED) 1541 if (expect_false (ta->next->flags & CF_DESTROYED))
1268 { 1542 {
1269 UNLOCK; 1543 UNLOCK;
1270 SvREFCNT_dec (next_sv); 1544 SvREFCNT_dec (next_sv);
1271 /* coro_nready is already taken care of by destroy */ 1545 /* coro_nready is already taken care of by destroy */
1272 continue; 1546 continue;
1317{ 1591{
1318 dTHX; 1592 dTHX;
1319 struct transfer_args ta; 1593 struct transfer_args ta;
1320 1594
1321 prepare_schedule (aTHX_ &ta); 1595 prepare_schedule (aTHX_ &ta);
1322 TRANSFER (ta); 1596 TRANSFER (ta, 1);
1323} 1597}
1324 1598
1325static int 1599static int
1326api_cede (void) 1600api_cede (void)
1327{ 1601{
1328 dTHX; 1602 dTHX;
1329 struct transfer_args ta; 1603 struct transfer_args ta;
1330 1604
1331 prepare_cede (aTHX_ &ta); 1605 prepare_cede (aTHX_ &ta);
1332 1606
1333 if (ta.prev != ta.next) 1607 if (expect_true (ta.prev != ta.next))
1334 { 1608 {
1335 TRANSFER (ta); 1609 TRANSFER (ta, 1);
1336 return 1; 1610 return 1;
1337 } 1611 }
1338 else 1612 else
1339 return 0; 1613 return 0;
1340} 1614}
1345 dTHX; 1619 dTHX;
1346 struct transfer_args ta; 1620 struct transfer_args ta;
1347 1621
1348 if (prepare_cede_notself (aTHX_ &ta)) 1622 if (prepare_cede_notself (aTHX_ &ta))
1349 { 1623 {
1350 TRANSFER (ta); 1624 TRANSFER (ta, 1);
1351 return 1; 1625 return 1;
1352 } 1626 }
1353 else 1627 else
1354 return 0; 1628 return 0;
1355} 1629}
1374 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL); 1648 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1375 1649
1376 if (coro->flags & CF_RUNNING) 1650 if (coro->flags & CF_RUNNING)
1377 PL_runops = RUNOPS_DEFAULT; 1651 PL_runops = RUNOPS_DEFAULT;
1378 else 1652 else
1379 coro->runops = RUNOPS_DEFAULT; 1653 coro->slot->runops = RUNOPS_DEFAULT;
1654 }
1655}
1656
1657static int
1658coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1659{
1660 AV *padlist;
1661 AV *av = (AV *)mg->mg_obj;
1662
1663 abort ();
1664
1665 return 0;
1666}
1667
1668static MGVTBL coro_gensub_vtbl = {
1669 0, 0, 0, 0,
1670 coro_gensub_free
1671};
1672
1673/*****************************************************************************/
1674/* PerlIO::cede */
1675
1676typedef struct
1677{
1678 PerlIOBuf base;
1679 NV next, every;
1680} PerlIOCede;
1681
1682static IV
1683PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
1684{
1685 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1686
1687 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
1688 self->next = nvtime () + self->every;
1689
1690 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
1691}
1692
1693static SV *
1694PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
1695{
1696 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1697
1698 return newSVnv (self->every);
1699}
1700
1701static IV
1702PerlIOCede_flush (pTHX_ PerlIO *f)
1703{
1704 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1705 double now = nvtime ();
1706
1707 if (now >= self->next)
1380 } 1708 {
1709 api_cede ();
1710 self->next = now + self->every;
1711 }
1712
1713 return PerlIOBuf_flush (aTHX_ f);
1381} 1714}
1715
1716static PerlIO_funcs PerlIO_cede =
1717{
1718 sizeof(PerlIO_funcs),
1719 "cede",
1720 sizeof(PerlIOCede),
1721 PERLIO_K_DESTRUCT | PERLIO_K_RAW,
1722 PerlIOCede_pushed,
1723 PerlIOBuf_popped,
1724 PerlIOBuf_open,
1725 PerlIOBase_binmode,
1726 PerlIOCede_getarg,
1727 PerlIOBase_fileno,
1728 PerlIOBuf_dup,
1729 PerlIOBuf_read,
1730 PerlIOBuf_unread,
1731 PerlIOBuf_write,
1732 PerlIOBuf_seek,
1733 PerlIOBuf_tell,
1734 PerlIOBuf_close,
1735 PerlIOCede_flush,
1736 PerlIOBuf_fill,
1737 PerlIOBase_eof,
1738 PerlIOBase_error,
1739 PerlIOBase_clearerr,
1740 PerlIOBase_setlinebuf,
1741 PerlIOBuf_get_base,
1742 PerlIOBuf_bufsiz,
1743 PerlIOBuf_get_ptr,
1744 PerlIOBuf_get_cnt,
1745 PerlIOBuf_set_ptrcnt,
1746};
1747
1382 1748
1383MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1749MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1384 1750
1385PROTOTYPES: DISABLE 1751PROTOTYPES: DISABLE
1386 1752
1387BOOT: 1753BOOT:
1388{ 1754{
1389#ifdef USE_ITHREADS 1755#ifdef USE_ITHREADS
1390 MUTEX_INIT (&coro_mutex); 1756 MUTEX_INIT (&coro_lock);
1391#endif 1757#endif
1392 BOOT_PAGESIZE; 1758 BOOT_PAGESIZE;
1393 1759
1394 irsgv = gv_fetchpv ("/", 1, SVt_PV); 1760 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1761 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1762
1763 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1764 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1765 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1766
1767 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1768 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1769 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1395 1770
1396 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1771 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1397 1772
1398 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1773 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1399 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1774 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1404 main_top_env = PL_top_env; 1779 main_top_env = PL_top_env;
1405 1780
1406 while (main_top_env->je_prev) 1781 while (main_top_env->je_prev)
1407 main_top_env = main_top_env->je_prev; 1782 main_top_env = main_top_env->je_prev;
1408 1783
1409 coroapi.ver = CORO_API_VERSION; 1784 coroapi.ver = CORO_API_VERSION;
1785 coroapi.rev = CORO_API_REVISION;
1410 coroapi.transfer = api_transfer; 1786 coroapi.transfer = api_transfer;
1787
1788 {
1789 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1790
1791 if (!svp) croak ("Time::HiRes is required");
1792 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
1793
1794 nvtime = INT2PTR (double (*)(), SvIV (*svp));
1795 }
1411 1796
1412 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1797 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1413} 1798}
1414 1799
1415SV * 1800SV *
1416new (char *klass, ...) 1801new (char *klass, ...)
1417 CODE: 1802 CODE:
1418{ 1803{
1419 struct coro *coro; 1804 struct coro *coro;
1805 MAGIC *mg;
1420 HV *hv; 1806 HV *hv;
1421 int i; 1807 int i;
1422 1808
1423 Newz (0, coro, 1, struct coro); 1809 Newz (0, coro, 1, struct coro);
1424 coro->args = newAV (); 1810 coro->args = newAV ();
1427 if (coro_first) coro_first->prev = coro; 1813 if (coro_first) coro_first->prev = coro;
1428 coro->next = coro_first; 1814 coro->next = coro_first;
1429 coro_first = coro; 1815 coro_first = coro;
1430 1816
1431 coro->hv = hv = newHV (); 1817 coro->hv = hv = newHV ();
1432 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1818 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1819 mg->mg_flags |= MGf_DUP;
1433 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1820 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1434 1821
1822 av_extend (coro->args, items - 1);
1435 for (i = 1; i < items; i++) 1823 for (i = 1; i < items; i++)
1436 av_push (coro->args, newSVsv (ST (i))); 1824 av_push (coro->args, newSVsv (ST (i)));
1437} 1825}
1438 OUTPUT: 1826 OUTPUT:
1439 RETVAL 1827 RETVAL
1450 Coro::cede_notself = 4 1838 Coro::cede_notself = 4
1451 CODE: 1839 CODE:
1452{ 1840{
1453 struct transfer_args ta; 1841 struct transfer_args ta;
1454 1842
1843 PUTBACK;
1455 switch (ix) 1844 switch (ix)
1456 { 1845 {
1457 case 0: 1846 case 0:
1458 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1847 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1459 ta.next = 0; 1848 ta.next = 0;
1460 break; 1849 break;
1461 1850
1462 case 1: 1851 case 1:
1463 if (items != 2) 1852 if (items != 2)
1464 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1853 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d", items);
1465 1854
1466 prepare_transfer (aTHX_ &ta, ST (0), ST (1)); 1855 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1467 break; 1856 break;
1468 1857
1469 case 2: 1858 case 2:
1478 if (!prepare_cede_notself (aTHX_ &ta)) 1867 if (!prepare_cede_notself (aTHX_ &ta))
1479 XSRETURN_EMPTY; 1868 XSRETURN_EMPTY;
1480 1869
1481 break; 1870 break;
1482 } 1871 }
1872 SPAGAIN;
1483 1873
1484 BARRIER; 1874 BARRIER;
1875 PUTBACK;
1485 TRANSFER (ta); 1876 TRANSFER (ta, 0);
1486 1877 SPAGAIN; /* might be the sp of a different coroutine now */
1487 if (GIMME_V != G_VOID && ta.next != ta.prev) 1878 /* be extra careful not to ever do anything after TRANSFER */
1488 XSRETURN_YES;
1489} 1879}
1490 1880
1491bool 1881bool
1492_destroy (SV *coro_sv) 1882_destroy (SV *coro_sv)
1493 CODE: 1883 CODE:
1494 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1884 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1495 OUTPUT: 1885 OUTPUT:
1496 RETVAL 1886 RETVAL
1497 1887
1498void 1888void
1499_exit (code) 1889_exit (int code)
1500 int code
1501 PROTOTYPE: $ 1890 PROTOTYPE: $
1502 CODE: 1891 CODE:
1503 _exit (code); 1892 _exit (code);
1504 1893
1505int 1894int
1506cctx_stacksize (int new_stacksize = 0) 1895cctx_stacksize (int new_stacksize = 0)
1507 CODE: 1896 CODE:
1508 RETVAL = coro_stacksize; 1897 RETVAL = cctx_stacksize;
1509 if (new_stacksize) 1898 if (new_stacksize)
1899 {
1510 coro_stacksize = new_stacksize; 1900 cctx_stacksize = new_stacksize;
1901 ++cctx_gen;
1902 }
1903 OUTPUT:
1904 RETVAL
1905
1906int
1907cctx_max_idle (int max_idle = 0)
1908 CODE:
1909 RETVAL = cctx_max_idle;
1910 if (max_idle > 1)
1911 cctx_max_idle = max_idle;
1511 OUTPUT: 1912 OUTPUT:
1512 RETVAL 1913 RETVAL
1513 1914
1514int 1915int
1515cctx_count () 1916cctx_count ()
1539call (Coro::State coro, SV *coderef) 1940call (Coro::State coro, SV *coderef)
1540 ALIAS: 1941 ALIAS:
1541 eval = 1 1942 eval = 1
1542 CODE: 1943 CODE:
1543{ 1944{
1544 if (coro->mainstack) 1945 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1545 { 1946 {
1546 struct coro temp; 1947 struct coro temp;
1547 Zero (&temp, 1, struct coro);
1548 1948
1549 if (!(coro->flags & CF_RUNNING)) 1949 if (!(coro->flags & CF_RUNNING))
1550 { 1950 {
1951 PUTBACK;
1551 save_perl (aTHX_ &temp); 1952 save_perl (aTHX_ &temp);
1552 load_perl (aTHX_ coro); 1953 load_perl (aTHX_ coro);
1553 } 1954 }
1554 1955
1555 { 1956 {
1556 dSP; 1957 dSP;
1557 ENTER; 1958 ENTER;
1558 SAVETMPS; 1959 SAVETMPS;
1960 PUTBACK;
1961 PUSHSTACK;
1559 PUSHMARK (SP); 1962 PUSHMARK (SP);
1560 PUTBACK; 1963
1561 if (ix) 1964 if (ix)
1562 eval_sv (coderef, 0); 1965 eval_sv (coderef, 0);
1563 else 1966 else
1564 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1967 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1968
1969 POPSTACK;
1565 SPAGAIN; 1970 SPAGAIN;
1566 FREETMPS; 1971 FREETMPS;
1567 LEAVE; 1972 LEAVE;
1568 PUTBACK; 1973 PUTBACK;
1569 } 1974 }
1570 1975
1571 if (!(coro->flags & CF_RUNNING)) 1976 if (!(coro->flags & CF_RUNNING))
1572 { 1977 {
1573 save_perl (aTHX_ coro); 1978 save_perl (aTHX_ coro);
1574 load_perl (aTHX_ &temp); 1979 load_perl (aTHX_ &temp);
1980 SPAGAIN;
1575 } 1981 }
1576 } 1982 }
1577} 1983}
1578 1984
1579SV * 1985SV *
1591 1997
1592void 1998void
1593api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 1999api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1594 2000
1595SV * 2001SV *
1596has_stack (Coro::State coro) 2002has_cctx (Coro::State coro)
1597 PROTOTYPE: $ 2003 PROTOTYPE: $
1598 CODE: 2004 CODE:
1599 RETVAL = boolSV (!!coro->cctx); 2005 RETVAL = boolSV (!!coro->cctx);
1600 OUTPUT: 2006 OUTPUT:
1601 RETVAL 2007 RETVAL
1620 case 1: RETVAL = coro->usecount; break; 2026 case 1: RETVAL = coro->usecount; break;
1621 } 2027 }
1622 OUTPUT: 2028 OUTPUT:
1623 RETVAL 2029 RETVAL
1624 2030
2031void
2032force_cctx ()
2033 CODE:
2034 struct coro *coro = SvSTATE (coro_current);
2035 coro->cctx->idle_sp = 0;
2036
2037void
2038swap_defsv (Coro::State self)
2039 PROTOTYPE: $
2040 ALIAS:
2041 swap_defav = 1
2042 CODE:
2043 if (!self->slot)
2044 croak ("cannot swap state with coroutine that has no saved state");
2045 else
2046 {
2047 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2048 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2049
2050 SV *tmp = *src; *src = *dst; *dst = tmp;
2051 }
1625 2052
1626MODULE = Coro::State PACKAGE = Coro 2053MODULE = Coro::State PACKAGE = Coro
1627 2054
1628BOOT: 2055BOOT:
1629{ 2056{
1630 int i; 2057 int i;
1631 2058
1632 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1633 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1634 av_async_pool = get_av ("Coro::async_pool", TRUE); 2059 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2060 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2061 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1635 2062
1636 coro_current = get_sv ("Coro::current", FALSE); 2063 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1637 SvREADONLY_on (coro_current); 2064 SvREADONLY_on (coro_current);
1638 2065
1639 coro_stash = gv_stashpv ("Coro", TRUE); 2066 coro_stash = gv_stashpv ("Coro", TRUE);
1640 2067
1641 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 2068 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1642 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 2069 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1643 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 2070 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1644 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 2071 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
1647 2074
1648 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2075 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1649 coro_ready[i] = newAV (); 2076 coro_ready[i] = newAV ();
1650 2077
1651 { 2078 {
1652 SV *sv = perl_get_sv("Coro::API", 1); 2079 SV *sv = perl_get_sv ("Coro::API", TRUE);
2080 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1653 2081
1654 coroapi.schedule = api_schedule; 2082 coroapi.schedule = api_schedule;
1655 coroapi.cede = api_cede; 2083 coroapi.cede = api_cede;
1656 coroapi.cede_notself = api_cede_notself; 2084 coroapi.cede_notself = api_cede_notself;
1657 coroapi.ready = api_ready; 2085 coroapi.ready = api_ready;
1668void 2096void
1669_set_current (SV *current) 2097_set_current (SV *current)
1670 PROTOTYPE: $ 2098 PROTOTYPE: $
1671 CODE: 2099 CODE:
1672 SvREFCNT_dec (SvRV (coro_current)); 2100 SvREFCNT_dec (SvRV (coro_current));
1673 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 2101 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
2102
2103void
2104_set_readyhook (SV *hook)
2105 PROTOTYPE: $
2106 CODE:
2107 LOCK;
2108 SvREFCNT_dec (coro_readyhook);
2109 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
2110 UNLOCK;
1674 2111
1675int 2112int
1676prio (Coro::State coro, int newprio = 0) 2113prio (Coro::State coro, int newprio = 0)
1677 ALIAS: 2114 ALIAS:
1678 nice = 1 2115 nice = 1
1708 CODE: 2145 CODE:
1709 RETVAL = coro_nready; 2146 RETVAL = coro_nready;
1710 OUTPUT: 2147 OUTPUT:
1711 RETVAL 2148 RETVAL
1712 2149
2150void
2151throw (Coro::State self, SV *throw = &PL_sv_undef)
2152 PROTOTYPE: $;$
2153 CODE:
2154 SvREFCNT_dec (self->throw);
2155 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2156
1713# for async_pool speedup 2157# for async_pool speedup
1714void 2158void
1715_pool_1 (SV *cb) 2159_pool_1 (SV *cb)
1716 CODE: 2160 CODE:
1717{ 2161{
1720 AV *defav = GvAV (PL_defgv); 2164 AV *defav = GvAV (PL_defgv);
1721 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 2165 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1722 AV *invoke_av; 2166 AV *invoke_av;
1723 int i, len; 2167 int i, len;
1724 2168
1725 coro->defoutgv = SvREFCNT_inc (PL_defoutgv);
1726
1727 if (!invoke) 2169 if (!invoke)
2170 {
2171 SV *old = PL_diehook;
2172 PL_diehook = 0;
2173 SvREFCNT_dec (old);
1728 croak ("\3terminate\2\n"); 2174 croak ("\3async_pool terminate\2\n");
2175 }
2176
2177 SvREFCNT_dec (coro->saved_deffh);
2178 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1729 2179
1730 hv_store (hv, "desc", sizeof ("desc") - 1, 2180 hv_store (hv, "desc", sizeof ("desc") - 1,
1731 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2181 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1732 2182
1733 invoke_av = (AV *)SvRV (invoke); 2183 invoke_av = (AV *)SvRV (invoke);
1737 2187
1738 if (len > 0) 2188 if (len > 0)
1739 { 2189 {
1740 av_fill (defav, len - 1); 2190 av_fill (defav, len - 1);
1741 for (i = 0; i < len; ++i) 2191 for (i = 0; i < len; ++i)
1742 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2192 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
1743 } 2193 }
1744
1745
1746 2194
1747 SvREFCNT_dec (invoke); 2195 SvREFCNT_dec (invoke);
1748} 2196}
1749 2197
1750void 2198void
1753{ 2201{
1754 struct coro *coro = SvSTATE (coro_current); 2202 struct coro *coro = SvSTATE (coro_current);
1755 2203
1756 sv_setsv (cb, &PL_sv_undef); 2204 sv_setsv (cb, &PL_sv_undef);
1757 2205
1758 SvREFCNT_dec (PL_defoutgv); PL_defoutgv = coro->defoutgv; 2206 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2207 coro->saved_deffh = 0;
1759 2208
1760 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2209 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1761 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2210 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2211 {
2212 SV *old = PL_diehook;
2213 PL_diehook = 0;
2214 SvREFCNT_dec (old);
1762 croak ("\3terminate\2\n"); 2215 croak ("\3async_pool terminate\2\n");
2216 }
1763 2217
1764 av_clear (GvAV (PL_defgv)); 2218 av_clear (GvAV (PL_defgv));
1765 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2219 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1766 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2220 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1767 2221
1771 api_trace (coro_current, 0); 2225 api_trace (coro_current, 0);
1772 2226
1773 av_push (av_async_pool, newSVsv (coro_current)); 2227 av_push (av_async_pool, newSVsv (coro_current));
1774} 2228}
1775 2229
2230#if 0
2231
2232void
2233_generator_call (...)
2234 PROTOTYPE: @
2235 PPCODE:
2236 fprintf (stderr, "call %p\n", CvXSUBANY(cv).any_ptr);
2237 xxxx
2238 abort ();
2239
2240SV *
2241gensub (SV *sub, ...)
2242 PROTOTYPE: &;@
2243 CODE:
2244{
2245 struct coro *coro;
2246 MAGIC *mg;
2247 CV *xcv;
2248 CV *ncv = (CV *)newSV_type (SVt_PVCV);
2249 int i;
2250
2251 CvGV (ncv) = CvGV (cv);
2252 CvFILE (ncv) = CvFILE (cv);
2253
2254 Newz (0, coro, 1, struct coro);
2255 coro->args = newAV ();
2256 coro->flags = CF_NEW;
2257
2258 av_extend (coro->args, items - 1);
2259 for (i = 1; i < items; i++)
2260 av_push (coro->args, newSVsv (ST (i)));
2261
2262 CvISXSUB_on (ncv);
2263 CvXSUBANY (ncv).any_ptr = (void *)coro;
2264
2265 xcv = GvCV (gv_fetchpv ("Coro::_generator_call", 0, SVt_PVCV));
2266
2267 CvXSUB (ncv) = CvXSUB (xcv);
2268 CvANON_on (ncv);
2269
2270 mg = sv_magicext ((SV *)ncv, 0, CORO_MAGIC_type_state, &coro_gensub_vtbl, (char *)coro, 0);
2271 RETVAL = newRV_noinc ((SV *)ncv);
2272}
2273 OUTPUT:
2274 RETVAL
2275
2276#endif
2277
1776 2278
1777MODULE = Coro::State PACKAGE = Coro::AIO 2279MODULE = Coro::State PACKAGE = Coro::AIO
1778 2280
1779SV * 2281void
1780_get_state () 2282_get_state (SV *self)
1781 CODE: 2283 PPCODE:
1782{ 2284{
1783 struct io_state *data; 2285 AV *defav = GvAV (PL_defgv);
1784 2286 AV *av = newAV ();
2287 int i;
1785 RETVAL = newSV (sizeof (struct io_state)); 2288 SV *data_sv = newSV (sizeof (struct io_state));
1786 data = (struct io_state *)SvPVX (RETVAL); 2289 struct io_state *data = (struct io_state *)SvPVX (data_sv);
1787 SvCUR_set (RETVAL, sizeof (struct io_state)); 2290 SvCUR_set (data_sv, sizeof (struct io_state));
1788 SvPOK_only (RETVAL); 2291 SvPOK_only (data_sv);
1789 2292
1790 data->errorno = errno; 2293 data->errorno = errno;
1791 data->laststype = PL_laststype; 2294 data->laststype = PL_laststype;
1792 data->laststatval = PL_laststatval; 2295 data->laststatval = PL_laststatval;
1793 data->statcache = PL_statcache; 2296 data->statcache = PL_statcache;
2297
2298 av_extend (av, AvFILLp (defav) + 1 + 1);
2299
2300 for (i = 0; i <= AvFILLp (defav); ++i)
2301 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i]));
2302
2303 av_push (av, data_sv);
2304
2305 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2306
2307 api_ready (self);
1794} 2308}
1795 OUTPUT:
1796 RETVAL
1797 2309
1798void 2310void
1799_set_state (char *data_) 2311_set_state (SV *state)
1800 PROTOTYPE: $ 2312 PROTOTYPE: $
1801 CODE: 2313 PPCODE:
1802{ 2314{
1803 struct io_state *data = (void *)data_; 2315 AV *av = (AV *)SvRV (state);
2316 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]);
2317 int i;
1804 2318
1805 errno = data->errorno; 2319 errno = data->errorno;
1806 PL_laststype = data->laststype; 2320 PL_laststype = data->laststype;
1807 PL_laststatval = data->laststatval; 2321 PL_laststatval = data->laststatval;
1808 PL_statcache = data->statcache; 2322 PL_statcache = data->statcache;
1809}
1810 2323
2324 EXTEND (SP, AvFILLp (av));
2325 for (i = 0; i < AvFILLp (av); ++i)
2326 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2327}
2328
2329
2330MODULE = Coro::State PACKAGE = Coro::AnyEvent
2331
2332BOOT:
2333 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2334
2335SV *
2336_schedule (...)
2337 PROTOTYPE: @
2338 CODE:
2339{
2340 static int incede;
2341
2342 api_cede_notself ();
2343
2344 ++incede;
2345 while (coro_nready >= incede && api_cede ())
2346 ;
2347
2348 sv_setsv (sv_activity, &PL_sv_undef);
2349 if (coro_nready >= incede)
2350 {
2351 PUSHMARK (SP);
2352 PUTBACK;
2353 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2354 SPAGAIN;
2355 }
2356
2357 --incede;
2358}
2359
2360
2361MODULE = Coro::State PACKAGE = PerlIO::cede
2362
2363BOOT:
2364 PerlIO_define_layer (aTHX_ &PerlIO_cede);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines