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.167 by root, Thu Sep 27 15:52:31 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 */
174
175static GV *irsgv; /* $/ */
176static GV *stdoutgv; /* *STDOUT */
177static SV *rv_diehook;
178static SV *rv_warnhook;
179static HV *hv_sig; /* %SIG */
136 180
137/* async_pool helper stuff */ 181/* async_pool helper stuff */
138static SV *sv_pool_rss; 182static SV *sv_pool_rss;
139static SV *sv_pool_size; 183static SV *sv_pool_size;
140static AV *av_async_pool; 184static AV *av_async_pool;
185
186/* Coro::AnyEvent */
187static SV *sv_activity;
141 188
142static struct coro_cctx *cctx_first; 189static struct coro_cctx *cctx_first;
143static int cctx_count, cctx_idle; 190static int cctx_count, cctx_idle;
144 191
145enum { 192enum {
… …
163 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 210 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
164 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 */
165 JMPENV *top_env; 212 JMPENV *top_env;
166 coro_context cctx; 213 coro_context cctx;
167 214
215 U32 gen;
168#if CORO_USE_VALGRIND 216#if CORO_USE_VALGRIND
169 int valgrind_id; 217 int valgrind_id;
170#endif 218#endif
171 unsigned char flags; 219 unsigned char flags;
172} coro_cctx; 220} coro_cctx;
… …
176 CF_READY = 0x0002, /* coroutine is ready */ 224 CF_READY = 0x0002, /* coroutine is ready */
177 CF_NEW = 0x0004, /* has never been switched to */ 225 CF_NEW = 0x0004, /* has never been switched to */
178 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 226 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
179}; 227};
180 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
181/* this is a structure representing a perl-level coroutine */ 242/* this is a structure representing a perl-level coroutine */
182struct coro { 243struct coro {
183 /* the c coroutine allocated to this perl coroutine, if any */ 244 /* the c coroutine allocated to this perl coroutine, if any */
184 coro_cctx *cctx; 245 coro_cctx *cctx;
185 246
247 /* process data */
248 AV *mainstack;
249 perl_slots *slot; /* basically the saved sp */
250
186 /* data associated with this coroutine (initial args) */ 251 AV *args; /* data associated with this coroutine (initial args) */
187 AV *args; 252 int refcnt; /* coroutines are refcounted, yes */
188 int refcnt;
189 int save; /* CORO_SAVE flags */
190 int flags; /* CF_ flags */ 253 int flags; /* CF_ flags */
254 HV *hv; /* the perl hash associated with this coro, if any */
191 255
192 /* optionally saved, might be zero */ 256 /* statistics */
193 AV *defav; /* @_ */ 257 int usecount; /* number of transfers to this coro */
194 SV *defsv; /* $_ */
195 SV *errsv; /* $@ */
196 GV *deffh; /* default filehandle */
197 SV *irssv; /* $/ */
198 SV *irssv_sv; /* real $/ cache */
199
200#define VAR(name,type) type name;
201# include "state.h"
202#undef VAR
203 258
204 /* coro process data */ 259 /* coro process data */
205 int prio; 260 int prio;
261 SV *throw; /* exception to be thrown */
262
263 /* async_pool */
264 SV *saved_deffh;
206 265
207 /* linked list */ 266 /* linked list */
208 struct coro *next, *prev; 267 struct coro *next, *prev;
209 HV *hv; /* the perl hash associated with this coro, if any */
210}; 268};
211 269
212typedef struct coro *Coro__State; 270typedef struct coro *Coro__State;
213typedef struct coro *Coro__State_or_hashref; 271typedef struct coro *Coro__State_or_hashref;
214 272
… …
221#define PRIO_IDLE -3 279#define PRIO_IDLE -3
222#define PRIO_MIN -4 280#define PRIO_MIN -4
223 281
224/* for Coro.pm */ 282/* for Coro.pm */
225static SV *coro_current; 283static SV *coro_current;
284static SV *coro_readyhook;
226static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 285static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
227static int coro_nready; 286static int coro_nready;
228static struct coro *coro_first; 287static struct coro *coro_first;
229 288
230/** lowlevel stuff **********************************************************/ 289/** lowlevel stuff **********************************************************/
231 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
232static AV * 321static AV *
233coro_clone_padlist (pTHX_ CV *cv) 322coro_clone_padlist (pTHX_ CV *cv)
234{ 323{
235 AV *padlist = CvPADLIST (cv); 324 AV *padlist = CvPADLIST (cv);
236 AV *newpadlist, *newpad; 325 AV *newpadlist, *newpad;
237 326
238 newpadlist = newAV (); 327 newpadlist = newAV ();
239 AvREAL_off (newpadlist); 328 AvREAL_off (newpadlist);
240#if PERL_VERSION_ATLEAST (5,9,0) 329#if PERL_VERSION_ATLEAST (5,10,0)
241 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1); 330 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1);
242#else 331#else
243 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 332 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
244#endif 333#endif
245 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 334 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
246 --AvFILLp (padlist); 335 --AvFILLp (padlist);
247 336
248 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 337 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
249 av_store (newpadlist, 1, (SV *)newpad); 338 av_store (newpadlist, 1, (SV *)newpad);
250 339
251 return newpadlist; 340 return newpadlist;
252} 341}
253 342
… …
283 372
284 /* casting is fun. */ 373 /* casting is fun. */
285 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 374 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
286 free_padlist (aTHX_ padlist); 375 free_padlist (aTHX_ padlist);
287 376
288 SvREFCNT_dec (av); 377 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
289 378
290 return 0; 379 return 0;
291} 380}
292 381
293#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
294 384
295static 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};
296 389
297#define CORO_MAGIC(cv) \ 390#define CORO_MAGIC(sv, type) \
298 SvMAGIC (cv) \ 391 SvMAGIC (sv) \
299 ? SvMAGIC (cv)->mg_type == PERL_MAGIC_coro \ 392 ? SvMAGIC (sv)->mg_type == type \
300 ? SvMAGIC (cv) \ 393 ? SvMAGIC (sv) \
301 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 394 : mg_find (sv, type) \
302 : 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)
399
400static struct coro *
401SvSTATE_ (pTHX_ SV *coro)
402{
403 HV *stash;
404 MAGIC *mg;
405
406 if (SvROK (coro))
407 coro = SvRV (coro);
408
409 if (expect_false (SvTYPE (coro) != SVt_PVHV))
410 croak ("Coro::State object required");
411
412 stash = SvSTASH (coro);
413 if (expect_false (stash != coro_stash && stash != coro_state_stash))
414 {
415 /* very slow, but rare, check */
416 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
417 croak ("Coro::State object required");
418 }
419
420 mg = CORO_MAGIC_state (coro);
421 return (struct coro *)mg->mg_ptr;
422}
423
424#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
303 425
304/* the next two functions merely cache the padlists */ 426/* the next two functions merely cache the padlists */
305static void 427static void
306get_padlist (pTHX_ CV *cv) 428get_padlist (pTHX_ CV *cv)
307{ 429{
308 MAGIC *mg = CORO_MAGIC (cv); 430 MAGIC *mg = CORO_MAGIC_cv (cv);
309 AV *av; 431 AV *av;
310 432
311 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 433 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
312 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 434 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
313 else 435 else
314 { 436 {
315#if CORO_PREFER_PERL_FUNCTIONS 437#if CORO_PREFER_PERL_FUNCTIONS
316 /* this is probably cleaner, but also slower? */ 438 /* this is probably cleaner? but also slower! */
439 /* in practise, it seems to be less stable */
317 CV *cp = Perl_cv_clone (cv); 440 CV *cp = Perl_cv_clone (cv);
318 CvPADLIST (cv) = CvPADLIST (cp); 441 CvPADLIST (cv) = CvPADLIST (cp);
319 CvPADLIST (cp) = 0; 442 CvPADLIST (cp) = 0;
320 SvREFCNT_dec (cp); 443 SvREFCNT_dec (cp);
321#else 444#else
… …
325} 448}
326 449
327static void 450static void
328put_padlist (pTHX_ CV *cv) 451put_padlist (pTHX_ CV *cv)
329{ 452{
330 MAGIC *mg = CORO_MAGIC (cv); 453 MAGIC *mg = CORO_MAGIC_cv (cv);
331 AV *av; 454 AV *av;
332 455
333 if (!mg) 456 if (expect_false (!mg))
334 { 457 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
335 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
336 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
337 mg->mg_virtual = &vtbl_coro;
338 mg->mg_obj = (SV *)newAV ();
339 }
340 458
341 av = (AV *)mg->mg_obj; 459 av = (AV *)mg->mg_obj;
342 460
343 if (AvFILLp (av) >= AvMAX (av)) 461 if (expect_false (AvFILLp (av) >= AvMAX (av)))
344 av_extend (av, AvMAX (av) + 1); 462 av_extend (av, AvMAX (av) + 1);
345 463
346 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 464 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
347} 465}
348 466
349/** load & save, init *******************************************************/ 467/** load & save, init *******************************************************/
350
351#define SB do {
352#define SE } while (0)
353
354#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
355 468
356static void 469static void
357load_perl (pTHX_ Coro__State c) 470load_perl (pTHX_ Coro__State c)
358{ 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
359#define VAR(name,type) PL_ ## name = c->name; 482 #define VAR(name,type) PL_ ## name = slot->name;
360# include "state.h" 483 # include "state.h"
361#undef VAR 484 #undef VAR
362
363 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
364 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
365 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
366 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
367
368 if (c->irssv)
369 {
370 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
371 {
372 SvREFCNT_dec (c->irssv);
373 c->irssv = 0;
374 }
375 else
376 {
377 REPLACE_SV (PL_rs, c->irssv);
378 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
379 sv_setsv (c->irssv_sv, PL_rs);
380 }
381 }
382 485
383 { 486 {
384 dSP; 487 dSP;
488
385 CV *cv; 489 CV *cv;
386 490
387 /* now do the ugly restore mess */ 491 /* now do the ugly restore mess */
388 while ((cv = (CV *)POPs)) 492 while (expect_true (cv = (CV *)POPs))
389 { 493 {
390 put_padlist (aTHX_ cv); /* mark this padlist as available */ 494 put_padlist (aTHX_ cv); /* mark this padlist as available */
391 CvDEPTH (cv) = PTR2IV (POPs); 495 CvDEPTH (cv) = PTR2IV (POPs);
392 CvPADLIST (cv) = (AV *)POPs; 496 CvPADLIST (cv) = (AV *)POPs;
393 } 497 }
… …
412 516
413 XPUSHs (Nullsv); 517 XPUSHs (Nullsv);
414 /* this loop was inspired by pp_caller */ 518 /* this loop was inspired by pp_caller */
415 for (;;) 519 for (;;)
416 { 520 {
417 while (cxix >= 0) 521 while (expect_true (cxix >= 0))
418 { 522 {
419 PERL_CONTEXT *cx = &ccstk[cxix--]; 523 PERL_CONTEXT *cx = &ccstk[cxix--];
420 524
421 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 525 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
422 { 526 {
423 CV *cv = cx->blk_sub.cv; 527 CV *cv = cx->blk_sub.cv;
424 528
425 if (CvDEPTH (cv)) 529 if (expect_true (CvDEPTH (cv)))
426 { 530 {
427 EXTEND (SP, 3); 531 EXTEND (SP, 3);
428 PUSHs ((SV *)CvPADLIST (cv)); 532 PUSHs ((SV *)CvPADLIST (cv));
429 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 533 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
430 PUSHs ((SV *)cv); 534 PUSHs ((SV *)cv);
431 535
432 CvDEPTH (cv) = 0; 536 CvDEPTH (cv) = 0;
433 get_padlist (aTHX_ cv); 537 get_padlist (aTHX_ cv);
434 } 538 }
435 } 539 }
436 } 540 }
437 541
438 if (top_si->si_type == PERLSI_MAIN) 542 if (expect_true (top_si->si_type == PERLSI_MAIN))
439 break; 543 break;
440 544
441 top_si = top_si->si_prev; 545 top_si = top_si->si_prev;
442 ccstk = top_si->si_cxstack; 546 ccstk = top_si->si_cxstack;
443 cxix = top_si->si_cxix; 547 cxix = top_si->si_cxix;
444 } 548 }
445 549
446 PUTBACK; 550 PUTBACK;
447 } 551 }
448 552
449 c->defav = c->save & CORO_SAVE_DEFAV ? (AV *)SvREFCNT_inc (GvAV (PL_defgv)) : 0; 553 /* allocate some space on the context stack for our purposes */
450 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 554 /* we manually unroll here, as usually 2 slots is enough */
451 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 555 if (SLOT_COUNT >= 1) CXINC;
452 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 556 if (SLOT_COUNT >= 2) CXINC;
453 c->irssv = c->save & CORO_SAVE_IRSSV ? SvREFCNT_inc (PL_rs) : 0; 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 */
454 564
565 c->mainstack = PL_mainstack;
566
567 {
568 perl_slots *slot = c->slot = (perl_slots *)(cxstack + cxstack_ix + 1);
569
570 slot->defav = GvAV (PL_defgv);
571 slot->defsv = DEFSV;
572 slot->errsv = ERRSV;
573 slot->irsgv = GvSV (irsgv);
574
455#define VAR(name,type)c->name = PL_ ## name; 575 #define VAR(name,type) slot->name = PL_ ## name;
456# include "state.h" 576 # include "state.h"
457#undef VAR 577 #undef VAR
578 }
458} 579}
459 580
460/* 581/*
461 * allocate various perl stacks. This is an exact copy 582 * allocate various perl stacks. This is an exact copy
462 * of perl.c:init_stacks, except that it uses less memory 583 * of perl.c:init_stacks, except that it uses less memory
… …
467# define coro_init_stacks init_stacks 588# define coro_init_stacks init_stacks
468#else 589#else
469static void 590static void
470coro_init_stacks (pTHX) 591coro_init_stacks (pTHX)
471{ 592{
472 PL_curstackinfo = new_stackinfo(64, 6); 593 PL_curstackinfo = new_stackinfo(32, 8);
473 PL_curstackinfo->si_type = PERLSI_MAIN; 594 PL_curstackinfo->si_type = PERLSI_MAIN;
474 PL_curstack = PL_curstackinfo->si_stack; 595 PL_curstack = PL_curstackinfo->si_stack;
475 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 596 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
476 597
477 PL_stack_base = AvARRAY(PL_curstack); 598 PL_stack_base = AvARRAY(PL_curstack);
478 PL_stack_sp = PL_stack_base; 599 PL_stack_sp = PL_stack_base;
479 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 600 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
480 601
481 New(50,PL_tmps_stack,64,SV*); 602 New(50,PL_tmps_stack,32,SV*);
482 PL_tmps_floor = -1; 603 PL_tmps_floor = -1;
483 PL_tmps_ix = -1; 604 PL_tmps_ix = -1;
484 PL_tmps_max = 64; 605 PL_tmps_max = 32;
485 606
486 New(54,PL_markstack,16,I32); 607 New(54,PL_markstack,16,I32);
487 PL_markstack_ptr = PL_markstack; 608 PL_markstack_ptr = PL_markstack;
488 PL_markstack_max = PL_markstack + 16; 609 PL_markstack_max = PL_markstack + 16;
489 610
490#ifdef SET_MARK_OFFSET 611#ifdef SET_MARK_OFFSET
491 SET_MARK_OFFSET; 612 SET_MARK_OFFSET;
492#endif 613#endif
493 614
494 New(54,PL_scopestack,16,I32); 615 New(54,PL_scopestack,8,I32);
495 PL_scopestack_ix = 0; 616 PL_scopestack_ix = 0;
496 PL_scopestack_max = 16; 617 PL_scopestack_max = 8;
497 618
498 New(54,PL_savestack,64,ANY); 619 New(54,PL_savestack,24,ANY);
499 PL_savestack_ix = 0; 620 PL_savestack_ix = 0;
500 PL_savestack_max = 64; 621 PL_savestack_max = 24;
501 622
502#if !PERL_VERSION_ATLEAST (5,9,0) 623#if !PERL_VERSION_ATLEAST (5,10,0)
503 New(54,PL_retstack,4,OP*); 624 New(54,PL_retstack,4,OP*);
504 PL_retstack_ix = 0; 625 PL_retstack_ix = 0;
505 PL_retstack_max = 4; 626 PL_retstack_max = 4;
506#endif 627#endif
507} 628}
… …
509 630
510/* 631/*
511 * destroy the stacks, the callchain etc... 632 * destroy the stacks, the callchain etc...
512 */ 633 */
513static void 634static void
514coro_destroy_stacks (pTHX) 635coro_destruct_stacks (pTHX)
515{ 636{
516 if (!IN_DESTRUCT)
517 {
518 /* restore all saved variables and stuff */
519 LEAVE_SCOPE (0);
520 assert (PL_tmps_floor == -1);
521
522 /* free all temporaries */
523 FREETMPS;
524 assert (PL_tmps_ix == -1);
525
526 /* unwind all extra stacks */
527 POPSTACK_TO (PL_mainstack);
528
529 /* unwind main stack */
530 dounwind (-1);
531 }
532
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)
537 { 641 {
… …
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 (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 ************************************************/
589 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}
792
590static void 793static void
591setup_coro (pTHX_ struct coro *coro) 794coro_setup (pTHX_ struct coro *coro)
592{ 795{
593 /* 796 /*
594 * emulate part of the perl startup here. 797 * emulate part of the perl startup here.
595 */ 798 */
596 coro_init_stacks (aTHX); 799 coro_init_stacks (aTHX);
597 800
801 PL_runops = RUNOPS_DEFAULT;
598 PL_curcop = &PL_compiling; 802 PL_curcop = &PL_compiling;
599 PL_in_eval = EVAL_NULL; 803 PL_in_eval = EVAL_NULL;
600 PL_comppad = 0; 804 PL_comppad = 0;
601 PL_curpm = 0; 805 PL_curpm = 0;
806 PL_curpad = 0;
602 PL_localizing = 0; 807 PL_localizing = 0;
603 PL_dirty = 0; 808 PL_dirty = 0;
604 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);
817
818 GvSV (PL_defgv) = newSV (0);
819 GvAV (PL_defgv) = coro->args; coro->args = 0;
820 GvSV (PL_errgv) = newSV (0);
821 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
822 PL_rs = newSVsv (GvSV (irsgv));
823 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
605 824
606 { 825 {
607 dSP; 826 dSP;
608 LOGOP myop; 827 LOGOP myop;
609 828
610 SvREFCNT_dec (GvAV (PL_defgv));
611 GvAV (PL_defgv) = coro->args; coro->args = 0;
612
613 Zero (&myop, 1, LOGOP); 829 Zero (&myop, 1, LOGOP);
614 myop.op_next = Nullop; 830 myop.op_next = Nullop;
615 myop.op_flags = OPf_WANT_VOID; 831 myop.op_flags = OPf_WANT_VOID;
616 832
617 PUSHMARK (SP); 833 PUSHMARK (SP);
618 XPUSHs (av_shift (GvAV (PL_defgv))); 834 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
619 PUTBACK; 835 PUTBACK;
620 PL_op = (OP *)&myop; 836 PL_op = (OP *)&myop;
621 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 837 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
622 SPAGAIN; 838 SPAGAIN;
623 } 839 }
624 840
625 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;
847}
848
849static void
850coro_destruct (pTHX_ struct coro *coro)
851{
852 if (!IN_DESTRUCT)
853 {
854 /* restore all saved variables and stuff */
855 LEAVE_SCOPE (0);
856 assert (PL_tmps_floor == -1);
857
858 /* free all temporaries */
859 FREETMPS;
860 assert (PL_tmps_ix == -1);
861
862 /* unwind all extra stacks */
863 POPSTACK_TO (PL_mainstack);
864
865 /* unwind main stack */
866 dounwind (-1);
867 }
868
869 SvREFCNT_dec (GvSV (PL_defgv));
870 SvREFCNT_dec (GvAV (PL_defgv));
871 SvREFCNT_dec (GvSV (PL_errgv));
872 SvREFCNT_dec (PL_defoutgv);
873 SvREFCNT_dec (PL_rs);
874 SvREFCNT_dec (GvSV (irsgv));
875
876 SvREFCNT_dec (PL_diehook);
877 SvREFCNT_dec (PL_warnhook);
878
879 SvREFCNT_dec (coro->saved_deffh);
880 SvREFCNT_dec (coro->throw);
881
882 coro_destruct_stacks (aTHX);
626} 883}
627 884
628static void 885static void
629free_coro_mortal (pTHX) 886free_coro_mortal (pTHX)
630{ 887{
631 if (coro_mortal) 888 if (expect_true (coro_mortal))
632 { 889 {
633 SvREFCNT_dec (coro_mortal); 890 SvREFCNT_dec (coro_mortal);
634 coro_mortal = 0; 891 coro_mortal = 0;
635 } 892 }
636} 893}
637 894
638static int 895static int
639runops_coro (pTHX) 896runops_trace (pTHX)
640{ 897{
641 COP *oldcop = 0; 898 COP *oldcop = 0;
642 int oldcxix = -2; 899 int oldcxix = -2;
900 struct coro *coro = SvSTATE (coro_current); /* trace cctx is tied to specific coro */
901 coro_cctx *cctx = coro->cctx;
643 902
644 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 903 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
645 { 904 {
646 PERL_ASYNC_CHECK (); 905 PERL_ASYNC_CHECK ();
647 906
648 if (PL_op->op_type == OP_LEAVESUB) 907 if (cctx->flags & CC_TRACE_ALL)
649 { 908 {
650 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 909 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB)
651 SV **bot, **top;
652 AV *av = newAV (); /* return values */
653 runops_proc_t old_runops = PL_runops;
654 dSP;
655 ENTER;
656 SAVETMPS;
657 EXTEND (SP, 3);
658 PL_runops = RUNOPS_DEFAULT;
659
660 GV *gv = CvGV (cx->blk_sub.cv);
661 SV *fullname = sv_2mortal (newSV (0));
662 if (isGV (gv))
663 gv_efullname3 (fullname, gv, 0);
664
665 bot = PL_stack_base + cx->blk_oldsp + 1;
666 top = cx->blk_gimme == G_ARRAY ? SP + 1
667 : cx->blk_gimme == G_SCALAR ? bot + 1
668 : bot;
669
670 while (bot < top)
671 av_push (av, SvREFCNT_inc (*bot++));
672
673 PUSHMARK (SP);
674 PUSHs (&PL_sv_no);
675 PUSHs (fullname);
676 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
677 PUTBACK;
678 call_pv ("Coro::_do_trace_sub", G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
679 SPAGAIN;
680
681 FREETMPS;
682 LEAVE;
683 PL_runops = old_runops;
684 }
685
686 if (oldcop != PL_curcop)
687 {
688 oldcop = PL_curcop;
689
690 if (PL_curcop != &PL_compiling)
691 { 910 {
692 runops_proc_t old_runops = PL_runops; 911 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
912 SV **bot, **top;
913 AV *av = newAV (); /* return values */
914 SV **cb;
693 dSP; 915 dSP;
916
917 GV *gv = CvGV (cx->blk_sub.cv);
918 SV *fullname = sv_2mortal (newSV (0));
919 if (isGV (gv))
920 gv_efullname3 (fullname, gv, 0);
921
922 bot = PL_stack_base + cx->blk_oldsp + 1;
923 top = cx->blk_gimme == G_ARRAY ? SP + 1
924 : cx->blk_gimme == G_SCALAR ? bot + 1
925 : bot;
926
927 av_extend (av, top - bot);
928 while (bot < top)
929 av_push (av, SvREFCNT_inc_NN (*bot++));
930
931 PL_runops = RUNOPS_DEFAULT;
694 ENTER; 932 ENTER;
695 SAVETMPS; 933 SAVETMPS;
696 EXTEND (SP, 3); 934 EXTEND (SP, 3);
697 PL_runops = RUNOPS_DEFAULT;
698
699 if (oldcxix != cxstack_ix)
700 {
701 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
702
703 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
704 {
705 GV *gv = CvGV (cx->blk_sub.cv);
706 SV *fullname = sv_2mortal (newSV (0));
707 if (isGV (gv))
708 gv_efullname3 (fullname, gv, 0);
709
710 PUSHMARK (SP);
711 PUSHs (&PL_sv_yes);
712 PUSHs (fullname);
713 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
714 PUTBACK;
715 call_pv ("Coro::_do_trace_sub", G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
716 SPAGAIN;
717 }
718
719 oldcxix = cxstack_ix;
720 }
721
722 if (0) {
723 PUSHMARK (SP); 935 PUSHMARK (SP);
724 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 936 PUSHs (&PL_sv_no);
725 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 937 PUSHs (fullname);
938 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
726 PUTBACK; 939 PUTBACK;
940 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
727 call_pv ("Coro::_do_trace_line", G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 941 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
728 SPAGAIN; 942 SPAGAIN;
729 }
730
731 FREETMPS; 943 FREETMPS;
732 LEAVE; 944 LEAVE;
733 PL_runops = old_runops; 945 PL_runops = runops_trace;
946 }
947
948 if (oldcop != PL_curcop)
949 {
950 oldcop = PL_curcop;
951
952 if (PL_curcop != &PL_compiling)
953 {
954 SV **cb;
955
956 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
957 {
958 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
959
960 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix)
961 {
962 runops_proc_t old_runops = PL_runops;
963 dSP;
964 GV *gv = CvGV (cx->blk_sub.cv);
965 SV *fullname = sv_2mortal (newSV (0));
966
967 if (isGV (gv))
968 gv_efullname3 (fullname, gv, 0);
969
970 PL_runops = RUNOPS_DEFAULT;
971 ENTER;
972 SAVETMPS;
973 EXTEND (SP, 3);
974 PUSHMARK (SP);
975 PUSHs (&PL_sv_yes);
976 PUSHs (fullname);
977 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
978 PUTBACK;
979 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
980 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
981 SPAGAIN;
982 FREETMPS;
983 LEAVE;
984 PL_runops = runops_trace;
985 }
986
987 oldcxix = cxstack_ix;
988 }
989
990 if (cctx->flags & CC_TRACE_LINE)
991 {
992 dSP;
993
994 PL_runops = RUNOPS_DEFAULT;
995 ENTER;
996 SAVETMPS;
997 EXTEND (SP, 3);
998 PL_runops = RUNOPS_DEFAULT;
999 PUSHMARK (SP);
1000 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1001 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1002 PUTBACK;
1003 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
1004 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1005 SPAGAIN;
1006 FREETMPS;
1007 LEAVE;
1008 PL_runops = runops_trace;
1009 }
1010 }
734 } 1011 }
735 } 1012 }
736 } 1013 }
737 1014
738 TAINT_NOT; 1015 TAINT_NOT;
… …
741 1018
742/* 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 */
743/* _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 */
744/* during execution of a perl program */ 1021/* during execution of a perl program */
745static void NOINLINE 1022static void NOINLINE
746prepare_cctx (pTHX_ coro_cctx *cctx) 1023cctx_prepare (pTHX_ coro_cctx *cctx)
747{ 1024{
748 dSP; 1025 dSP;
749 LOGOP myop; 1026 LOGOP myop;
750 1027
751 PL_top_env = &PL_start_env; 1028 PL_top_env = &PL_start_env;
752 1029
753 if (cctx->flags & CC_TRACE) 1030 if (cctx->flags & CC_TRACE)
754 PL_runops = runops_coro; 1031 PL_runops = runops_trace;
755 1032
756 Zero (&myop, 1, LOGOP); 1033 Zero (&myop, 1, LOGOP);
757 myop.op_next = PL_op; 1034 myop.op_next = PL_op;
758 myop.op_flags = OPf_WANT_VOID | OPf_STACKED; 1035 myop.op_flags = OPf_WANT_VOID | OPf_STACKED;
759 1036
… …
769 1046
770/* 1047/*
771 * this is a _very_ stripped down perl interpreter ;) 1048 * this is a _very_ stripped down perl interpreter ;)
772 */ 1049 */
773static void 1050static void
774coro_run (void *arg) 1051cctx_run (void *arg)
775{ 1052{
776 dTHX; 1053 dTHX;
777 1054
778 /* coro_run is the alternative tail of transfer(), so unlock here. */ 1055 /* cctx_run is the alternative tail of transfer(), so unlock here. */
779 UNLOCK; 1056 UNLOCK;
780 1057
781 /* we now skip the entersub that lead to transfer() */ 1058 /* we now skip the entersub that lead to transfer() */
782 PL_op = PL_op->op_next; 1059 PL_op = PL_op->op_next;
783 1060
784 /* inject a fake subroutine call to cctx_init */ 1061 /* inject a fake subroutine call to cctx_init */
785 prepare_cctx (aTHX_ (coro_cctx *)arg); 1062 cctx_prepare (aTHX_ (coro_cctx *)arg);
786 1063
787 /* 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 */
788 PL_restartop = PL_op; 1065 PL_restartop = PL_op;
789 perl_run (PL_curinterp); 1066 perl_run (PL_curinterp);
790 1067
… …
805 coro_cctx *cctx; 1082 coro_cctx *cctx;
806 void *stack_start; 1083 void *stack_start;
807 size_t stack_size; 1084 size_t stack_size;
808 1085
809 ++cctx_count; 1086 ++cctx_count;
810
811 Newz (0, cctx, 1, coro_cctx); 1087 Newz (0, cctx, 1, coro_cctx);
812 1088
1089 cctx->gen = cctx_gen;
1090
813#if HAVE_MMAP 1091#if HAVE_MMAP
814
815 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;
816 /* mmap supposedly does allocate-on-write for us */ 1093 /* mmap supposedly does allocate-on-write for us */
817 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);
818 1095
819 if (cctx->sptr != (void *)-1) 1096 if (cctx->sptr != (void *)-1)
820 { 1097 {
… …
826 cctx->flags |= CC_MAPPED; 1103 cctx->flags |= CC_MAPPED;
827 } 1104 }
828 else 1105 else
829#endif 1106#endif
830 { 1107 {
831 cctx->ssize = coro_stacksize * (long)sizeof (long); 1108 cctx->ssize = cctx_stacksize * (long)sizeof (long);
832 New (0, cctx->sptr, coro_stacksize, long); 1109 New (0, cctx->sptr, cctx_stacksize, long);
833 1110
834 if (!cctx->sptr) 1111 if (!cctx->sptr)
835 { 1112 {
836 perror ("FATAL: unable to allocate stack for coroutine"); 1113 perror ("FATAL: unable to allocate stack for coroutine");
837 _exit (EXIT_FAILURE); 1114 _exit (EXIT_FAILURE);
… …
840 stack_start = cctx->sptr; 1117 stack_start = cctx->sptr;
841 stack_size = cctx->ssize; 1118 stack_size = cctx->ssize;
842 } 1119 }
843 1120
844 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1121 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
845 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);
846 1123
847 return cctx; 1124 return cctx;
848} 1125}
849 1126
850static void 1127static void
… …
852{ 1129{
853 if (!cctx) 1130 if (!cctx)
854 return; 1131 return;
855 1132
856 --cctx_count; 1133 --cctx_count;
1134 coro_destroy (&cctx->cctx);
857 1135
1136 /* coro_transfer creates new, empty cctx's */
1137 if (cctx->sptr)
1138 {
858#if CORO_USE_VALGRIND 1139#if CORO_USE_VALGRIND
859 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1140 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
860#endif 1141#endif
861 1142
862#if HAVE_MMAP 1143#if HAVE_MMAP
863 if (cctx->flags & CC_MAPPED) 1144 if (cctx->flags & CC_MAPPED)
864 munmap (cctx->sptr, cctx->ssize); 1145 munmap (cctx->sptr, cctx->ssize);
865 else 1146 else
866#endif 1147#endif
867 Safefree (cctx->sptr); 1148 Safefree (cctx->sptr);
1149 }
868 1150
869 Safefree (cctx); 1151 Safefree (cctx);
870} 1152}
1153
1154/* wether this cctx should be destructed */
1155#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
871 1156
872static coro_cctx * 1157static coro_cctx *
873cctx_get (pTHX) 1158cctx_get (pTHX)
874{ 1159{
875 while (cctx_first) 1160 while (expect_true (cctx_first))
876 { 1161 {
877 coro_cctx *cctx = cctx_first; 1162 coro_cctx *cctx = cctx_first;
878 cctx_first = cctx->next; 1163 cctx_first = cctx->next;
879 --cctx_idle; 1164 --cctx_idle;
880 1165
881 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1166 if (expect_true (!CCTX_EXPIRED (cctx)))
882 return cctx; 1167 return cctx;
883 1168
884 cctx_destroy (cctx); 1169 cctx_destroy (cctx);
885 } 1170 }
886 1171
… …
888} 1173}
889 1174
890static void 1175static void
891cctx_put (coro_cctx *cctx) 1176cctx_put (coro_cctx *cctx)
892{ 1177{
1178 assert (("cctx_put called on non-initialised cctx", cctx->sptr));
1179
893 /* free another cctx if overlimit */ 1180 /* free another cctx if overlimit */
894 if (cctx_idle >= MAX_IDLE_CCTX) 1181 if (expect_false (cctx_idle >= cctx_max_idle))
895 { 1182 {
896 coro_cctx *first = cctx_first; 1183 coro_cctx *first = cctx_first;
897 cctx_first = first->next; 1184 cctx_first = first->next;
898 --cctx_idle; 1185 --cctx_idle;
899 1186
… …
905 cctx_first = cctx; 1192 cctx_first = cctx;
906} 1193}
907 1194
908/** coroutine switching *****************************************************/ 1195/** coroutine switching *****************************************************/
909 1196
910/* never call directly, always through the coro_state_transfer global variable */ 1197static void
1198transfer_check (pTHX_ struct coro *prev, struct coro *next)
1199{
1200 if (expect_true (prev != next))
1201 {
1202 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1203 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
1204
1205 if (expect_false (next->flags & CF_RUNNING))
1206 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
1207
1208 if (expect_false (next->flags & CF_DESTROYED))
1209 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
1210
1211#if !PERL_VERSION_ATLEAST (5,10,0)
1212 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1213 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version");
1214#endif
1215 }
1216}
1217
1218/* always use the TRANSFER macro */
911static void NOINLINE 1219static void NOINLINE
912transfer (pTHX_ struct coro *prev, struct coro *next) 1220transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
913{ 1221{
914 dSTACKLEVEL; 1222 dSTACKLEVEL;
915 1223
916 /* sometimes transfer is only called to set idle_sp */ 1224 /* sometimes transfer is only called to set idle_sp */
917 if (!next) 1225 if (expect_false (!next))
918 { 1226 {
919 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1227 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
920 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 */
921 } 1229 }
922 else if (prev != next) 1230 else if (expect_true (prev != next))
923 { 1231 {
1232 static volatile int has_throw;
924 coro_cctx *prev__cctx; 1233 coro_cctx *prev__cctx;
925 1234
926 if (prev->flags & CF_NEW) 1235 if (expect_false (prev->flags & CF_NEW))
927 { 1236 {
928 /* create a new empty context */ 1237 /* create a new empty/source context */
1238 ++cctx_count;
929 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
930 prev->flags &= ~CF_NEW; 1243 prev->flags &= ~CF_NEW;
931 prev->flags |= CF_RUNNING; 1244 prev->flags |= CF_RUNNING;
932 } 1245 }
933 1246
934 /*TODO: must not croak here */
935 if (!prev->flags & CF_RUNNING)
936 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
937
938 if (next->flags & CF_RUNNING)
939 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
940
941 if (next->flags & CF_DESTROYED)
942 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
943
944 prev->flags &= ~CF_RUNNING; 1247 prev->flags &= ~CF_RUNNING;
945 next->flags |= CF_RUNNING; 1248 next->flags |= CF_RUNNING;
946 1249
947 LOCK; 1250 LOCK;
948 1251
1252 /* first get rid of the old state */
1253 save_perl (aTHX_ prev);
1254
949 if (next->flags & CF_NEW) 1255 if (expect_false (next->flags & CF_NEW))
950 { 1256 {
951 /* need to start coroutine */ 1257 /* need to start coroutine */
952 next->flags &= ~CF_NEW; 1258 next->flags &= ~CF_NEW;
953 /* first get rid of the old state */
954 save_perl (aTHX_ prev);
955 /* setup coroutine call */ 1259 /* setup coroutine call */
956 setup_coro (aTHX_ next); 1260 coro_setup (aTHX_ next);
957 } 1261 }
958 else 1262 else
959 {
960 /* coroutine already started */
961 save_perl (aTHX_ prev);
962 load_perl (aTHX_ next); 1263 load_perl (aTHX_ next);
963 }
964 1264
965 prev__cctx = prev->cctx; 1265 prev__cctx = prev->cctx;
966 1266
967 /* possibly "free" the cctx */ 1267 /* possibly "free" the cctx */
1268 if (expect_true (
968 if (prev__cctx->idle_sp == STACKLEVEL) 1269 prev__cctx->idle_sp == STACKLEVEL
1270 && !(prev__cctx->flags & CC_TRACE)
1271 && !force_cctx
1272 ))
969 { 1273 {
970 /* 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 */
971 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));
972 1276
973 prev->cctx = 0; 1277 prev->cctx = 0;
974 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
975 cctx_put (prev__cctx); 1285 cctx_put (prev__cctx);
976 } 1286 }
977 1287
1288 ++next->usecount;
1289
978 if (!next->cctx) 1290 if (expect_true (!next->cctx))
979 next->cctx = cctx_get (aTHX); 1291 next->cctx = cctx_get (aTHX);
980 1292
1293 has_throw = !!next->throw;
1294
981 if (prev__cctx != next->cctx) 1295 if (expect_false (prev__cctx != next->cctx))
982 { 1296 {
983 prev__cctx->top_env = PL_top_env; 1297 prev__cctx->top_env = PL_top_env;
984 PL_top_env = next->cctx->top_env; 1298 PL_top_env = next->cctx->top_env;
985 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1299 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
986 } 1300 }
987 1301
988 free_coro_mortal (aTHX); 1302 free_coro_mortal (aTHX);
989 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 }
990 } 1317 }
991} 1318}
992 1319
993struct transfer_args 1320struct transfer_args
994{ 1321{
995 struct coro *prev, *next; 1322 struct coro *prev, *next;
996}; 1323};
997 1324
1325#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
998#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1326#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
999 1327
1000/** high level stuff ********************************************************/ 1328/** high level stuff ********************************************************/
1001 1329
1002static int 1330static int
1003coro_state_destroy (pTHX_ struct coro *coro) 1331coro_state_destroy (pTHX_ struct coro *coro)
… …
1020 1348
1021 if (coro->mainstack && coro->mainstack != main_mainstack) 1349 if (coro->mainstack && coro->mainstack != main_mainstack)
1022 { 1350 {
1023 struct coro temp; 1351 struct coro temp;
1024 1352
1025 assert (!(coro->flags & CF_RUNNING));
1026
1027 Zero (&temp, 1, struct coro);
1028 temp.save = CORO_SAVE_ALL;
1029
1030 if (coro->flags & CF_RUNNING) 1353 if (coro->flags & CF_RUNNING)
1031 croak ("FATAL: tried to destroy currently running coroutine"); 1354 croak ("FATAL: tried to destroy currently running coroutine");
1032 1355
1033 save_perl (aTHX_ &temp); 1356 save_perl (aTHX_ &temp);
1034 load_perl (aTHX_ coro); 1357 load_perl (aTHX_ coro);
1035 1358
1036 coro_destroy_stacks (aTHX); 1359 coro_destruct (aTHX_ coro);
1037 1360
1038 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1361 load_perl (aTHX_ &temp);
1039 1362
1040 coro->mainstack = 0; 1363 coro->slot = 0;
1041 } 1364 }
1042 1365
1043 cctx_destroy (coro->cctx); 1366 cctx_destroy (coro->cctx);
1044 SvREFCNT_dec (coro->args); 1367 SvREFCNT_dec (coro->args);
1045 1368
… …
1086#else 1409#else
1087# define MGf_DUP 0 1410# define MGf_DUP 0
1088#endif 1411#endif
1089}; 1412};
1090 1413
1091static struct coro *
1092SvSTATE_ (pTHX_ SV *coro)
1093{
1094 HV *stash;
1095 MAGIC *mg;
1096
1097 if (SvROK (coro))
1098 coro = SvRV (coro);
1099
1100 stash = SvSTASH (coro);
1101 if (stash != coro_stash && stash != coro_state_stash)
1102 {
1103 /* very slow, but rare, check */
1104 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
1105 croak ("Coro::State object required");
1106 }
1107
1108 mg = CORO_MAGIC (coro);
1109 return (struct coro *)mg->mg_ptr;
1110}
1111
1112#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
1113
1114static void 1414static void
1115prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv) 1415prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
1116{ 1416{
1117 ta->prev = SvSTATE (prev_sv); 1417 ta->prev = SvSTATE (prev_sv);
1118 ta->next = SvSTATE (next_sv); 1418 ta->next = SvSTATE (next_sv);
1419 TRANSFER_CHECK (*ta);
1119} 1420}
1120 1421
1121static void 1422static void
1122api_transfer (SV *prev_sv, SV *next_sv) 1423api_transfer (SV *prev_sv, SV *next_sv)
1123{ 1424{
1124 dTHX; 1425 dTHX;
1125 struct transfer_args ta; 1426 struct transfer_args ta;
1126 1427
1127 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1428 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1128 TRANSFER (ta); 1429 TRANSFER (ta, 1);
1129}
1130
1131static int
1132api_save (SV *coro_sv, int new_save)
1133{
1134 dTHX;
1135 struct coro *coro = SvSTATE (coro_sv);
1136 int old_save = coro->save;
1137
1138 if (new_save >= 0)
1139 coro->save = new_save;
1140
1141 return old_save;
1142} 1430}
1143 1431
1144/** Coro ********************************************************************/ 1432/** Coro ********************************************************************/
1145 1433
1146static void 1434static void
… …
1148{ 1436{
1149 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);
1150} 1438}
1151 1439
1152static SV * 1440static SV *
1153coro_deq (pTHX_ int min_prio) 1441coro_deq (pTHX)
1154{ 1442{
1155 int prio = PRIO_MAX - PRIO_MIN; 1443 int prio;
1156 1444
1157 min_prio -= PRIO_MIN;
1158 if (min_prio < 0)
1159 min_prio = 0;
1160
1161 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1445 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1162 if (AvFILLp (coro_ready [prio]) >= 0) 1446 if (AvFILLp (coro_ready [prio]) >= 0)
1163 return av_shift (coro_ready [prio]); 1447 return av_shift (coro_ready [prio]);
1164 1448
1165 return 0; 1449 return 0;
1166} 1450}
… …
1168static int 1452static int
1169api_ready (SV *coro_sv) 1453api_ready (SV *coro_sv)
1170{ 1454{
1171 dTHX; 1455 dTHX;
1172 struct coro *coro; 1456 struct coro *coro;
1457 SV *sv_hook;
1458 void (*xs_hook)(void);
1173 1459
1174 if (SvROK (coro_sv)) 1460 if (SvROK (coro_sv))
1175 coro_sv = SvRV (coro_sv); 1461 coro_sv = SvRV (coro_sv);
1176 1462
1177 coro = SvSTATE (coro_sv); 1463 coro = SvSTATE (coro_sv);
… …
1180 return 0; 1466 return 0;
1181 1467
1182 coro->flags |= CF_READY; 1468 coro->flags |= CF_READY;
1183 1469
1184 LOCK; 1470 LOCK;
1471
1472 sv_hook = coro_nready ? 0 : coro_readyhook;
1473 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1474
1185 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1475 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1186 ++coro_nready; 1476 ++coro_nready;
1477
1187 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 ();
1188 1498
1189 return 1; 1499 return 1;
1190} 1500}
1191 1501
1192static int 1502static int
… …
1202 SV *prev_sv, *next_sv; 1512 SV *prev_sv, *next_sv;
1203 1513
1204 for (;;) 1514 for (;;)
1205 { 1515 {
1206 LOCK; 1516 LOCK;
1207 next_sv = coro_deq (aTHX_ PRIO_MIN); 1517 next_sv = coro_deq (aTHX);
1208 1518
1209 /* nothing to schedule: call the idle handler */ 1519 /* nothing to schedule: call the idle handler */
1210 if (!next_sv) 1520 if (expect_false (!next_sv))
1211 { 1521 {
1212 dSP; 1522 dSP;
1213 UNLOCK; 1523 UNLOCK;
1214 1524
1215 ENTER; 1525 ENTER;
1216 SAVETMPS; 1526 SAVETMPS;
1217 1527
1218 PUSHMARK (SP); 1528 PUSHMARK (SP);
1219 PUTBACK; 1529 PUTBACK;
1220 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1530 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1531 SPAGAIN;
1221 1532
1222 FREETMPS; 1533 FREETMPS;
1223 LEAVE; 1534 LEAVE;
1224 continue; 1535 continue;
1225 } 1536 }
1226 1537
1227 ta->next = SvSTATE (next_sv); 1538 ta->next = SvSTATE (next_sv);
1228 1539
1229 /* cannot transfer to destroyed coros, skip and look for next */ 1540 /* cannot transfer to destroyed coros, skip and look for next */
1230 if (ta->next->flags & CF_DESTROYED) 1541 if (expect_false (ta->next->flags & CF_DESTROYED))
1231 { 1542 {
1232 UNLOCK; 1543 UNLOCK;
1233 SvREFCNT_dec (next_sv); 1544 SvREFCNT_dec (next_sv);
1234 /* coro_nready is already taken care of by destroy */ 1545 /* coro_nready is already taken care of by destroy */
1235 continue; 1546 continue;
… …
1240 break; 1551 break;
1241 } 1552 }
1242 1553
1243 /* free this only after the transfer */ 1554 /* free this only after the transfer */
1244 prev_sv = SvRV (coro_current); 1555 prev_sv = SvRV (coro_current);
1245 SvRV_set (coro_current, next_sv);
1246 ta->prev = SvSTATE (prev_sv); 1556 ta->prev = SvSTATE (prev_sv);
1247 1557 TRANSFER_CHECK (*ta);
1248 assert (ta->next->flags & CF_READY); 1558 assert (ta->next->flags & CF_READY);
1249 ta->next->flags &= ~CF_READY; 1559 ta->next->flags &= ~CF_READY;
1560 SvRV_set (coro_current, next_sv);
1250 1561
1251 LOCK; 1562 LOCK;
1252 free_coro_mortal (aTHX); 1563 free_coro_mortal (aTHX);
1253 coro_mortal = prev_sv; 1564 coro_mortal = prev_sv;
1254 UNLOCK; 1565 UNLOCK;
… …
1280{ 1591{
1281 dTHX; 1592 dTHX;
1282 struct transfer_args ta; 1593 struct transfer_args ta;
1283 1594
1284 prepare_schedule (aTHX_ &ta); 1595 prepare_schedule (aTHX_ &ta);
1285 TRANSFER (ta); 1596 TRANSFER (ta, 1);
1286} 1597}
1287 1598
1288static int 1599static int
1289api_cede (void) 1600api_cede (void)
1290{ 1601{
1291 dTHX; 1602 dTHX;
1292 struct transfer_args ta; 1603 struct transfer_args ta;
1293 1604
1294 prepare_cede (aTHX_ &ta); 1605 prepare_cede (aTHX_ &ta);
1295 1606
1296 if (ta.prev != ta.next) 1607 if (expect_true (ta.prev != ta.next))
1297 { 1608 {
1298 TRANSFER (ta); 1609 TRANSFER (ta, 1);
1299 return 1; 1610 return 1;
1300 } 1611 }
1301 else 1612 else
1302 return 0; 1613 return 0;
1303} 1614}
… …
1308 dTHX; 1619 dTHX;
1309 struct transfer_args ta; 1620 struct transfer_args ta;
1310 1621
1311 if (prepare_cede_notself (aTHX_ &ta)) 1622 if (prepare_cede_notself (aTHX_ &ta))
1312 { 1623 {
1313 TRANSFER (ta); 1624 TRANSFER (ta, 1);
1314 return 1; 1625 return 1;
1315 } 1626 }
1316 else 1627 else
1317 return 0; 1628 return 0;
1318} 1629}
1319 1630
1631static void
1632api_trace (SV *coro_sv, int flags)
1633{
1634 dTHX;
1635 struct coro *coro = SvSTATE (coro_sv);
1636
1637 if (flags & CC_TRACE)
1638 {
1639 if (!coro->cctx)
1640 coro->cctx = cctx_new ();
1641 else if (!(coro->cctx->flags & CC_TRACE))
1642 croak ("cannot enable tracing on coroutine with custom stack");
1643
1644 coro->cctx->flags |= CC_NOREUSE | (flags & (CC_TRACE | CC_TRACE_ALL));
1645 }
1646 else if (coro->cctx && coro->cctx->flags & CC_TRACE)
1647 {
1648 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1649
1650 if (coro->flags & CF_RUNNING)
1651 PL_runops = RUNOPS_DEFAULT;
1652 else
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)
1708 {
1709 api_cede ();
1710 self->next = now + self->every;
1711 }
1712
1713 return PerlIOBuf_flush (aTHX_ f);
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
1748
1320MODULE = Coro::State PACKAGE = Coro::State 1749MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1321 1750
1322PROTOTYPES: DISABLE 1751PROTOTYPES: DISABLE
1323 1752
1324BOOT: 1753BOOT:
1325{ 1754{
1326#ifdef USE_ITHREADS 1755#ifdef USE_ITHREADS
1327 MUTEX_INIT (&coro_mutex); 1756 MUTEX_INIT (&coro_lock);
1328#endif 1757#endif
1329 BOOT_PAGESIZE; 1758 BOOT_PAGESIZE;
1759
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));
1330 1770
1331 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1771 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1332 1772
1333 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1773 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1334 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1774 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1335 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1775 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1336 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1776 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1337 1777
1338 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1339 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1340 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1341 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1342 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1343 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1344 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1345
1346 main_mainstack = PL_mainstack; 1778 main_mainstack = PL_mainstack;
1347 main_top_env = PL_top_env; 1779 main_top_env = PL_top_env;
1348 1780
1349 while (main_top_env->je_prev) 1781 while (main_top_env->je_prev)
1350 main_top_env = main_top_env->je_prev; 1782 main_top_env = main_top_env->je_prev;
1351 1783
1352 coroapi.ver = CORO_API_VERSION; 1784 coroapi.ver = CORO_API_VERSION;
1785 coroapi.rev = CORO_API_REVISION;
1353 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 }
1354 1796
1355 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1797 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1356} 1798}
1357 1799
1358SV * 1800SV *
1359new (char *klass, ...) 1801new (char *klass, ...)
1360 CODE: 1802 CODE:
1361{ 1803{
1362 struct coro *coro; 1804 struct coro *coro;
1805 MAGIC *mg;
1363 HV *hv; 1806 HV *hv;
1364 int i; 1807 int i;
1365 1808
1366 Newz (0, coro, 1, struct coro); 1809 Newz (0, coro, 1, struct coro);
1367 coro->args = newAV (); 1810 coro->args = newAV ();
1368 coro->save = CORO_SAVE_DEF;
1369 coro->flags = CF_NEW; 1811 coro->flags = CF_NEW;
1370 1812
1371 if (coro_first) coro_first->prev = coro; 1813 if (coro_first) coro_first->prev = coro;
1372 coro->next = coro_first; 1814 coro->next = coro_first;
1373 coro_first = coro; 1815 coro_first = coro;
1374 1816
1375 coro->hv = hv = newHV (); 1817 coro->hv = hv = newHV ();
1376 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;
1377 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1820 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1378 1821
1822 av_extend (coro->args, items - 1);
1379 for (i = 1; i < items; i++) 1823 for (i = 1; i < items; i++)
1380 av_push (coro->args, newSVsv (ST (i))); 1824 av_push (coro->args, newSVsv (ST (i)));
1381} 1825}
1382 OUTPUT: 1826 OUTPUT:
1383 RETVAL 1827 RETVAL
1384 1828
1385int 1829# these not obviously related functions are all rolled into the same xs
1386save (SV *coro, int new_save = -1) 1830# function to increase chances that they all will call transfer with the same
1387 CODE: 1831# stack offset
1388 RETVAL = api_save (coro, new_save);
1389 OUTPUT:
1390 RETVAL
1391
1392int
1393save_also (SV *coro_sv, int save_also)
1394 CODE:
1395{
1396 struct coro *coro = SvSTATE (coro_sv);
1397 RETVAL = coro->save;
1398 coro->save |= save_also;
1399}
1400 OUTPUT:
1401 RETVAL
1402
1403void 1832void
1404_set_stacklevel (...) 1833_set_stacklevel (...)
1405 ALIAS: 1834 ALIAS:
1406 Coro::State::transfer = 1 1835 Coro::State::transfer = 1
1407 Coro::schedule = 2 1836 Coro::schedule = 2
… …
1409 Coro::cede_notself = 4 1838 Coro::cede_notself = 4
1410 CODE: 1839 CODE:
1411{ 1840{
1412 struct transfer_args ta; 1841 struct transfer_args ta;
1413 1842
1843 PUTBACK;
1414 switch (ix) 1844 switch (ix)
1415 { 1845 {
1416 case 0: 1846 case 0:
1417 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1847 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1418 ta.next = 0; 1848 ta.next = 0;
1419 break; 1849 break;
1420 1850
1421 case 1: 1851 case 1:
1422 if (items != 2) 1852 if (items != 2)
1423 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);
1424 1854
1425 prepare_transfer (aTHX_ &ta, ST (0), ST (1)); 1855 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1426 break; 1856 break;
1427 1857
1428 case 2: 1858 case 2:
… …
1437 if (!prepare_cede_notself (aTHX_ &ta)) 1867 if (!prepare_cede_notself (aTHX_ &ta))
1438 XSRETURN_EMPTY; 1868 XSRETURN_EMPTY;
1439 1869
1440 break; 1870 break;
1441 } 1871 }
1872 SPAGAIN;
1442 1873
1443 BARRIER; 1874 BARRIER;
1875 PUTBACK;
1444 TRANSFER (ta); 1876 TRANSFER (ta, 0);
1445 1877 SPAGAIN; /* might be the sp of a different coroutine now */
1446 if (GIMME_V != G_VOID && ta.next != ta.prev) 1878 /* be extra careful not to ever do anything after TRANSFER */
1447 XSRETURN_YES;
1448} 1879}
1449 1880
1450bool 1881bool
1451_destroy (SV *coro_sv) 1882_destroy (SV *coro_sv)
1452 CODE: 1883 CODE:
1453 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1884 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1454 OUTPUT: 1885 OUTPUT:
1455 RETVAL 1886 RETVAL
1456 1887
1457void 1888void
1458_exit (code) 1889_exit (int code)
1459 int code
1460 PROTOTYPE: $ 1890 PROTOTYPE: $
1461 CODE: 1891 CODE:
1462 _exit (code); 1892 _exit (code);
1463 1893
1464int 1894int
1465cctx_stacksize (int new_stacksize = 0) 1895cctx_stacksize (int new_stacksize = 0)
1466 CODE: 1896 CODE:
1467 RETVAL = coro_stacksize; 1897 RETVAL = cctx_stacksize;
1468 if (new_stacksize) 1898 if (new_stacksize)
1899 {
1469 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;
1470 OUTPUT: 1912 OUTPUT:
1471 RETVAL 1913 RETVAL
1472 1914
1473int 1915int
1474cctx_count () 1916cctx_count ()
… …
1498call (Coro::State coro, SV *coderef) 1940call (Coro::State coro, SV *coderef)
1499 ALIAS: 1941 ALIAS:
1500 eval = 1 1942 eval = 1
1501 CODE: 1943 CODE:
1502{ 1944{
1503 if (coro->mainstack) 1945 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1504 { 1946 {
1505 struct coro temp; 1947 struct coro temp;
1506 Zero (&temp, 1, struct coro);
1507 temp.save = CORO_SAVE_ALL;
1508 1948
1509 if (!(coro->flags & CF_RUNNING)) 1949 if (!(coro->flags & CF_RUNNING))
1510 { 1950 {
1951 PUTBACK;
1511 save_perl (aTHX_ &temp); 1952 save_perl (aTHX_ &temp);
1512 load_perl (aTHX_ coro); 1953 load_perl (aTHX_ coro);
1513 } 1954 }
1514 1955
1515 { 1956 {
1516 dSP; 1957 dSP;
1517 ENTER; 1958 ENTER;
1518 SAVETMPS; 1959 SAVETMPS;
1960 PUTBACK;
1961 PUSHSTACK;
1519 PUSHMARK (SP); 1962 PUSHMARK (SP);
1520 PUTBACK; 1963
1521 if (ix) 1964 if (ix)
1522 eval_sv (coderef, 0); 1965 eval_sv (coderef, 0);
1523 else 1966 else
1524 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;
1525 SPAGAIN; 1970 SPAGAIN;
1526 FREETMPS; 1971 FREETMPS;
1527 LEAVE; 1972 LEAVE;
1528 PUTBACK; 1973 PUTBACK;
1529 } 1974 }
1530 1975
1531 if (!(coro->flags & CF_RUNNING)) 1976 if (!(coro->flags & CF_RUNNING))
1532 { 1977 {
1533 save_perl (aTHX_ coro); 1978 save_perl (aTHX_ coro);
1534 load_perl (aTHX_ &temp); 1979 load_perl (aTHX_ &temp);
1980 SPAGAIN;
1535 } 1981 }
1536 } 1982 }
1537} 1983}
1538 1984
1539SV * 1985SV *
1540is_ready (Coro::State coro) 1986is_ready (Coro::State coro)
1541 PROTOTYPE: $ 1987 PROTOTYPE: $
1542 ALIAS: 1988 ALIAS:
1543 is_ready = CF_READY 1989 is_ready = CF_READY
… …
1548 RETVAL = boolSV (coro->flags & ix); 1994 RETVAL = boolSV (coro->flags & ix);
1549 OUTPUT: 1995 OUTPUT:
1550 RETVAL 1996 RETVAL
1551 1997
1552void 1998void
1553trace (Coro::State coro, int flags = CC_TRACE | CC_TRACE_SUB) 1999api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1554 CODE:
1555 if (flags & CC_TRACE)
1556 {
1557 if (!coro->cctx)
1558 coro->cctx = cctx_new ();
1559 else if (!(coro->cctx->flags & CC_TRACE))
1560 croak ("cannot enable tracing on coroutine with custom stack");
1561
1562 coro->cctx->flags |= flags & (CC_TRACE | CC_TRACE_ALL);
1563 }
1564 else
1565 if (coro->cctx && coro->cctx->flags & CC_TRACE)
1566 {
1567 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1568 coro->cctx->flags |= CC_NOREUSE;
1569 }
1570 2000
1571SV * 2001SV *
1572has_stack (Coro::State coro) 2002has_cctx (Coro::State coro)
1573 PROTOTYPE: $ 2003 PROTOTYPE: $
1574 CODE: 2004 CODE:
1575 RETVAL = boolSV (!!coro->cctx); 2005 RETVAL = boolSV (!!coro->cctx);
1576 OUTPUT: 2006 OUTPUT:
1577 RETVAL 2007 RETVAL
… …
1585 RETVAL 2015 RETVAL
1586 2016
1587IV 2017IV
1588rss (Coro::State coro) 2018rss (Coro::State coro)
1589 PROTOTYPE: $ 2019 PROTOTYPE: $
2020 ALIAS:
2021 usecount = 1
1590 CODE: 2022 CODE:
1591 RETVAL = coro_rss (coro); 2023 switch (ix)
2024 {
2025 case 0: RETVAL = coro_rss (aTHX_ coro); break;
2026 case 1: RETVAL = coro->usecount; break;
2027 }
1592 OUTPUT: 2028 OUTPUT:
1593 RETVAL 2029 RETVAL
1594 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 }
1595 2052
1596MODULE = Coro::State PACKAGE = Coro 2053MODULE = Coro::State PACKAGE = Coro
1597 2054
1598BOOT: 2055BOOT:
1599{ 2056{
1600 int i; 2057 int i;
1601 2058
1602 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1603 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1604 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);
1605 2062
1606 coro_current = get_sv ("Coro::current", FALSE); 2063 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1607 SvREADONLY_on (coro_current); 2064 SvREADONLY_on (coro_current);
1608 2065
1609 coro_stash = gv_stashpv ("Coro", TRUE); 2066 coro_stash = gv_stashpv ("Coro", TRUE);
1610 2067
1611 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 2068 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1612 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 2069 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1613 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 2070 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1614 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 2071 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1617 2074
1618 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2075 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1619 coro_ready[i] = newAV (); 2076 coro_ready[i] = newAV ();
1620 2077
1621 { 2078 {
1622 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 */
1623 2081
1624 coroapi.schedule = api_schedule; 2082 coroapi.schedule = api_schedule;
1625 coroapi.save = api_save;
1626 coroapi.cede = api_cede; 2083 coroapi.cede = api_cede;
1627 coroapi.cede_notself = api_cede_notself; 2084 coroapi.cede_notself = api_cede_notself;
1628 coroapi.ready = api_ready; 2085 coroapi.ready = api_ready;
1629 coroapi.is_ready = api_is_ready; 2086 coroapi.is_ready = api_is_ready;
1630 coroapi.nready = &coro_nready; 2087 coroapi.nready = &coro_nready;
… …
1639void 2096void
1640_set_current (SV *current) 2097_set_current (SV *current)
1641 PROTOTYPE: $ 2098 PROTOTYPE: $
1642 CODE: 2099 CODE:
1643 SvREFCNT_dec (SvRV (coro_current)); 2100 SvREFCNT_dec (SvRV (coro_current));
1644 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;
1645 2111
1646int 2112int
1647prio (Coro::State coro, int newprio = 0) 2113prio (Coro::State coro, int newprio = 0)
1648 ALIAS: 2114 ALIAS:
1649 nice = 1 2115 nice = 1
… …
1679 CODE: 2145 CODE:
1680 RETVAL = coro_nready; 2146 RETVAL = coro_nready;
1681 OUTPUT: 2147 OUTPUT:
1682 RETVAL 2148 RETVAL
1683 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
1684# for async_pool speedup 2157# for async_pool speedup
1685void 2158void
1686_pool_1 (SV *cb) 2159_pool_1 (SV *cb)
1687 CODE: 2160 CODE:
1688{ 2161{
1689 int i, len; 2162 struct coro *coro = SvSTATE (coro_current);
1690 HV *hv = (HV *)SvRV (coro_current); 2163 HV *hv = (HV *)SvRV (coro_current);
1691 AV *defav = GvAV (PL_defgv); 2164 AV *defav = GvAV (PL_defgv);
1692 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 2165 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1693 AV *invoke_av; 2166 AV *invoke_av;
2167 int i, len;
1694 2168
1695 if (!invoke) 2169 if (!invoke)
2170 {
2171 SV *old = PL_diehook;
2172 PL_diehook = 0;
2173 SvREFCNT_dec (old);
1696 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);
1697 2179
1698 hv_store (hv, "desc", sizeof ("desc") - 1, 2180 hv_store (hv, "desc", sizeof ("desc") - 1,
1699 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2181 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1700 2182
1701 invoke_av = (AV *)SvRV (invoke); 2183 invoke_av = (AV *)SvRV (invoke);
… …
1705 2187
1706 if (len > 0) 2188 if (len > 0)
1707 { 2189 {
1708 av_fill (defav, len - 1); 2190 av_fill (defav, len - 1);
1709 for (i = 0; i < len; ++i) 2191 for (i = 0; i < len; ++i)
1710 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2192 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
1711 } 2193 }
1712 2194
1713 SvREFCNT_dec (invoke); 2195 SvREFCNT_dec (invoke);
1714} 2196}
1715 2197
… …
1719{ 2201{
1720 struct coro *coro = SvSTATE (coro_current); 2202 struct coro *coro = SvSTATE (coro_current);
1721 2203
1722 sv_setsv (cb, &PL_sv_undef); 2204 sv_setsv (cb, &PL_sv_undef);
1723 2205
2206 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2207 coro->saved_deffh = 0;
2208
1724 if (coro_rss (coro) > SvIV (sv_pool_rss) 2209 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss)
1725 || 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);
1726 croak ("\3terminate\2\n"); 2215 croak ("\3async_pool terminate\2\n");
2216 }
1727 2217
1728 av_clear (GvAV (PL_defgv)); 2218 av_clear (GvAV (PL_defgv));
1729 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2219 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1730 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2220 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1731 coro->save = CORO_SAVE_DEF; 2221
1732 coro->prio = 0; 2222 coro->prio = 0;
2223
2224 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2225 api_trace (coro_current, 0);
2226
1733 av_push (av_async_pool, newSVsv (coro_current)); 2227 av_push (av_async_pool, newSVsv (coro_current));
1734} 2228}
1735 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
1736 2278
1737MODULE = Coro::State PACKAGE = Coro::AIO 2279MODULE = Coro::State PACKAGE = Coro::AIO
1738 2280
1739SV * 2281void
1740_get_state () 2282_get_state (SV *self)
1741 CODE: 2283 PPCODE:
1742{ 2284{
1743 struct io_state *data; 2285 AV *defav = GvAV (PL_defgv);
1744 2286 AV *av = newAV ();
2287 int i;
1745 RETVAL = newSV (sizeof (struct io_state)); 2288 SV *data_sv = newSV (sizeof (struct io_state));
1746 data = (struct io_state *)SvPVX (RETVAL); 2289 struct io_state *data = (struct io_state *)SvPVX (data_sv);
1747 SvCUR_set (RETVAL, sizeof (struct io_state)); 2290 SvCUR_set (data_sv, sizeof (struct io_state));
1748 SvPOK_only (RETVAL); 2291 SvPOK_only (data_sv);
1749 2292
1750 data->errorno = errno; 2293 data->errorno = errno;
1751 data->laststype = PL_laststype; 2294 data->laststype = PL_laststype;
1752 data->laststatval = PL_laststatval; 2295 data->laststatval = PL_laststatval;
1753 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);
1754} 2308}
1755 OUTPUT:
1756 RETVAL
1757 2309
1758void 2310void
1759_set_state (char *data_) 2311_set_state (SV *state)
1760 PROTOTYPE: $ 2312 PROTOTYPE: $
1761 CODE: 2313 PPCODE:
1762{ 2314{
1763 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;
1764 2318
1765 errno = data->errorno; 2319 errno = data->errorno;
1766 PL_laststype = data->laststype; 2320 PL_laststype = data->laststype;
1767 PL_laststatval = data->laststatval; 2321 PL_laststatval = data->laststatval;
1768 PL_statcache = data->statcache; 2322 PL_statcache = data->statcache;
1769}
1770 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