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.171 by root, Sat Sep 29 19:42:10 2007 UTC vs.
Revision 1.255 by root, Sat Nov 8 04:52:01 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; /* U16 in 5.10.0 */
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)
303 399
304static struct coro * 400static struct coro *
305SvSTATE_ (pTHX_ SV *coro) 401SvSTATE_ (pTHX_ SV *coro)
306{ 402{
307 HV *stash; 403 HV *stash;
308 MAGIC *mg; 404 MAGIC *mg;
309 405
310 if (SvROK (coro)) 406 if (SvROK (coro))
311 coro = SvRV (coro); 407 coro = SvRV (coro);
312 408
409 if (expect_false (SvTYPE (coro) != SVt_PVHV))
410 croak ("Coro::State object required");
411
313 stash = SvSTASH (coro); 412 stash = SvSTASH (coro);
314 if (stash != coro_stash && stash != coro_state_stash) 413 if (expect_false (stash != coro_stash && stash != coro_state_stash))
315 { 414 {
316 /* very slow, but rare, check */ 415 /* very slow, but rare, check */
317 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 416 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
318 croak ("Coro::State object required"); 417 croak ("Coro::State object required");
319 } 418 }
320 419
321 mg = CORO_MAGIC (coro); 420 mg = CORO_MAGIC_state (coro);
322 return (struct coro *)mg->mg_ptr; 421 return (struct coro *)mg->mg_ptr;
323} 422}
324 423
325#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv)) 424#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
326 425
327/* the next two functions merely cache the padlists */ 426/* the next two functions merely cache the padlists */
328static void 427static void
329get_padlist (pTHX_ CV *cv) 428get_padlist (pTHX_ CV *cv)
330{ 429{
331 MAGIC *mg = CORO_MAGIC (cv); 430 MAGIC *mg = CORO_MAGIC_cv (cv);
332 AV *av; 431 AV *av;
333 432
334 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 433 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
335 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 434 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
336 else 435 else
337 { 436 {
338#if CORO_PREFER_PERL_FUNCTIONS 437#if CORO_PREFER_PERL_FUNCTIONS
339 /* this is probably cleaner, but also slower? */ 438 /* this is probably cleaner? but also slower! */
439 /* in practise, it seems to be less stable */
340 CV *cp = Perl_cv_clone (cv); 440 CV *cp = Perl_cv_clone (cv);
341 CvPADLIST (cv) = CvPADLIST (cp); 441 CvPADLIST (cv) = CvPADLIST (cp);
342 CvPADLIST (cp) = 0; 442 CvPADLIST (cp) = 0;
343 SvREFCNT_dec (cp); 443 SvREFCNT_dec (cp);
344#else 444#else
… …
348} 448}
349 449
350static void 450static void
351put_padlist (pTHX_ CV *cv) 451put_padlist (pTHX_ CV *cv)
352{ 452{
353 MAGIC *mg = CORO_MAGIC (cv); 453 MAGIC *mg = CORO_MAGIC_cv (cv);
354 AV *av; 454 AV *av;
355 455
356 if (!mg) 456 if (expect_false (!mg))
357 { 457 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
358 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
359 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
360 mg->mg_virtual = &vtbl_coro;
361 mg->mg_obj = (SV *)newAV ();
362 }
363 458
364 av = (AV *)mg->mg_obj; 459 av = (AV *)mg->mg_obj;
365 460
366 if (AvFILLp (av) >= AvMAX (av)) 461 if (expect_false (AvFILLp (av) >= AvMAX (av)))
367 av_extend (av, AvMAX (av) + 1); 462 av_extend (av, AvMAX (av) + 1);
368 463
369 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 464 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
370} 465}
371 466
372/** load & save, init *******************************************************/ 467/** load & save, init *******************************************************/
373
374#define SB do {
375#define SE } while (0)
376
377#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
378 468
379static void 469static void
380load_perl (pTHX_ Coro__State c) 470load_perl (pTHX_ Coro__State c)
381{ 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
382#define VAR(name,type) PL_ ## name = c->name; 482 #define VAR(name,type) PL_ ## name = slot->name;
383# include "state.h" 483 # include "state.h"
384#undef VAR 484 #undef VAR
385
386 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
387 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
388 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
389 if (c->deffh) REPLACE_SV (PL_defoutgv , c->deffh);
390
391 if (c->irssv)
392 {
393 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
394 {
395 SvREFCNT_dec (c->irssv);
396 c->irssv = 0;
397 }
398 else
399 {
400 REPLACE_SV (PL_rs, c->irssv);
401 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
402 sv_setsv (c->irssv_sv, PL_rs);
403 }
404 }
405 485
406 { 486 {
407 dSP; 487 dSP;
488
408 CV *cv; 489 CV *cv;
409 490
410 /* now do the ugly restore mess */ 491 /* now do the ugly restore mess */
411 while ((cv = (CV *)POPs)) 492 while (expect_true (cv = (CV *)POPs))
412 { 493 {
413 put_padlist (aTHX_ cv); /* mark this padlist as available */ 494 put_padlist (aTHX_ cv); /* mark this padlist as available */
414 CvDEPTH (cv) = PTR2IV (POPs); 495 CvDEPTH (cv) = PTR2IV (POPs);
415 CvPADLIST (cv) = (AV *)POPs; 496 CvPADLIST (cv) = (AV *)POPs;
416 } 497 }
… …
435 516
436 XPUSHs (Nullsv); 517 XPUSHs (Nullsv);
437 /* this loop was inspired by pp_caller */ 518 /* this loop was inspired by pp_caller */
438 for (;;) 519 for (;;)
439 { 520 {
440 while (cxix >= 0) 521 while (expect_true (cxix >= 0))
441 { 522 {
442 PERL_CONTEXT *cx = &ccstk[cxix--]; 523 PERL_CONTEXT *cx = &ccstk[cxix--];
443 524
444 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 525 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
445 { 526 {
446 CV *cv = cx->blk_sub.cv; 527 CV *cv = cx->blk_sub.cv;
447 528
448 if (CvDEPTH (cv)) 529 if (expect_true (CvDEPTH (cv)))
449 { 530 {
450 EXTEND (SP, 3); 531 EXTEND (SP, 3);
451 PUSHs ((SV *)CvPADLIST (cv)); 532 PUSHs ((SV *)CvPADLIST (cv));
452 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 533 PUSHs (INT2PTR (SV *, (IV)CvDEPTH (cv)));
453 PUSHs ((SV *)cv); 534 PUSHs ((SV *)cv);
454 535
455 CvDEPTH (cv) = 0; 536 CvDEPTH (cv) = 0;
456 get_padlist (aTHX_ cv); 537 get_padlist (aTHX_ cv);
457 } 538 }
458 } 539 }
459 } 540 }
460 541
461 if (top_si->si_type == PERLSI_MAIN) 542 if (expect_true (top_si->si_type == PERLSI_MAIN))
462 break; 543 break;
463 544
464 top_si = top_si->si_prev; 545 top_si = top_si->si_prev;
465 ccstk = top_si->si_cxstack; 546 ccstk = top_si->si_cxstack;
466 cxix = top_si->si_cxix; 547 cxix = top_si->si_cxix;
467 } 548 }
468 549
469 PUTBACK; 550 PUTBACK;
470 } 551 }
471 552
472 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 */
473 c->defsv = c->save & CORO_SAVE_DEFSV ? SvREFCNT_inc (DEFSV) : 0; 554 /* we manually unroll here, as usually 2 slots is enough */
474 c->errsv = c->save & CORO_SAVE_ERRSV ? SvREFCNT_inc (ERRSV) : 0; 555 if (SLOT_COUNT >= 1) CXINC;
475 c->deffh = c->save & CORO_SAVE_DEFFH ? (GV *)SvREFCNT_inc (PL_defoutgv) : 0; 556 if (SLOT_COUNT >= 2) CXINC;
476 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 */
477 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
478#define VAR(name,type)c->name = PL_ ## name; 575 #define VAR(name,type) slot->name = PL_ ## name;
479# include "state.h" 576 # include "state.h"
480#undef VAR 577 #undef VAR
578 }
481} 579}
482 580
483/* 581/*
484 * allocate various perl stacks. This is an exact copy 582 * allocate various perl stacks. This is an exact copy
485 * of perl.c:init_stacks, except that it uses less memory 583 * of perl.c:init_stacks, except that it uses less memory
… …
490# define coro_init_stacks init_stacks 588# define coro_init_stacks init_stacks
491#else 589#else
492static void 590static void
493coro_init_stacks (pTHX) 591coro_init_stacks (pTHX)
494{ 592{
495 PL_curstackinfo = new_stackinfo(64, 6); 593 PL_curstackinfo = new_stackinfo(32, 8);
496 PL_curstackinfo->si_type = PERLSI_MAIN; 594 PL_curstackinfo->si_type = PERLSI_MAIN;
497 PL_curstack = PL_curstackinfo->si_stack; 595 PL_curstack = PL_curstackinfo->si_stack;
498 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 596 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
499 597
500 PL_stack_base = AvARRAY(PL_curstack); 598 PL_stack_base = AvARRAY(PL_curstack);
501 PL_stack_sp = PL_stack_base; 599 PL_stack_sp = PL_stack_base;
502 PL_stack_max = PL_stack_base + AvMAX(PL_curstack); 600 PL_stack_max = PL_stack_base + AvMAX(PL_curstack);
503 601
504 New(50,PL_tmps_stack,64,SV*); 602 New(50,PL_tmps_stack,32,SV*);
505 PL_tmps_floor = -1; 603 PL_tmps_floor = -1;
506 PL_tmps_ix = -1; 604 PL_tmps_ix = -1;
507 PL_tmps_max = 64; 605 PL_tmps_max = 32;
508 606
509 New(54,PL_markstack,16,I32); 607 New(54,PL_markstack,16,I32);
510 PL_markstack_ptr = PL_markstack; 608 PL_markstack_ptr = PL_markstack;
511 PL_markstack_max = PL_markstack + 16; 609 PL_markstack_max = PL_markstack + 16;
512 610
513#ifdef SET_MARK_OFFSET 611#ifdef SET_MARK_OFFSET
514 SET_MARK_OFFSET; 612 SET_MARK_OFFSET;
515#endif 613#endif
516 614
517 New(54,PL_scopestack,16,I32); 615 New(54,PL_scopestack,8,I32);
518 PL_scopestack_ix = 0; 616 PL_scopestack_ix = 0;
519 PL_scopestack_max = 16; 617 PL_scopestack_max = 8;
520 618
521 New(54,PL_savestack,64,ANY); 619 New(54,PL_savestack,24,ANY);
522 PL_savestack_ix = 0; 620 PL_savestack_ix = 0;
523 PL_savestack_max = 64; 621 PL_savestack_max = 24;
524 622
525#if !PERL_VERSION_ATLEAST (5,9,0) 623#if !PERL_VERSION_ATLEAST (5,10,0)
526 New(54,PL_retstack,4,OP*); 624 New(54,PL_retstack,4,OP*);
527 PL_retstack_ix = 0; 625 PL_retstack_ix = 0;
528 PL_retstack_max = 4; 626 PL_retstack_max = 4;
529#endif 627#endif
530} 628}
… …
532 630
533/* 631/*
534 * destroy the stacks, the callchain etc... 632 * destroy the stacks, the callchain etc...
535 */ 633 */
536static void 634static void
537coro_destroy_stacks (pTHX) 635coro_destruct_stacks (pTHX)
538{ 636{
539 if (!IN_DESTRUCT)
540 {
541 /* restore all saved variables and stuff */
542 LEAVE_SCOPE (0);
543 assert (PL_tmps_floor == -1);
544
545 /* free all temporaries */
546 FREETMPS;
547 assert (PL_tmps_ix == -1);
548
549 /* unwind all extra stacks */
550 POPSTACK_TO (PL_mainstack);
551
552 /* unwind main stack */
553 dounwind (-1);
554 }
555
556 while (PL_curstackinfo->si_next) 637 while (PL_curstackinfo->si_next)
557 PL_curstackinfo = PL_curstackinfo->si_next; 638 PL_curstackinfo = PL_curstackinfo->si_next;
558 639
559 while (PL_curstackinfo) 640 while (PL_curstackinfo)
560 { 641 {
… …
570 651
571 Safefree (PL_tmps_stack); 652 Safefree (PL_tmps_stack);
572 Safefree (PL_markstack); 653 Safefree (PL_markstack);
573 Safefree (PL_scopestack); 654 Safefree (PL_scopestack);
574 Safefree (PL_savestack); 655 Safefree (PL_savestack);
575#if !PERL_VERSION_ATLEAST (5,9,0) 656#if !PERL_VERSION_ATLEAST (5,10,0)
576 Safefree (PL_retstack); 657 Safefree (PL_retstack);
577#endif 658#endif
578} 659}
579 660
580static size_t 661static size_t
581coro_rss (pTHX_ struct coro *coro) 662coro_rss (pTHX_ struct coro *coro)
582{ 663{
583 size_t rss = sizeof (coro); 664 size_t rss = sizeof (*coro);
584 665
585 if (coro->mainstack) 666 if (coro->mainstack)
586 { 667 {
668 perl_slots tmp_slot;
669 perl_slots *slot;
670
587 if (coro->flags & CF_RUNNING) 671 if (coro->flags & CF_RUNNING)
588 { 672 {
673 slot = &tmp_slot;
674
589 #define VAR(name,type)coro->name = PL_ ## name; 675 #define VAR(name,type) slot->name = PL_ ## name;
590 # include "state.h" 676 # include "state.h"
591 #undef VAR 677 #undef VAR
592 } 678 }
679 else
680 slot = coro->slot;
593 681
682 if (slot)
683 {
594 rss += sizeof (coro->curstackinfo); 684 rss += sizeof (slot->curstackinfo);
595 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstackinfo->si_stack)) * sizeof (SV *);
596 rss += (coro->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 685 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
597 rss += sizeof (struct xpvav) + (1 + AvFILL (coro->curstack)) * sizeof (SV *); 686 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
598 rss += coro->tmps_max * sizeof (SV *); 687 rss += slot->tmps_max * sizeof (SV *);
599 rss += (coro->markstack_max - coro->markstack_ptr) * sizeof (I32); 688 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
600 rss += coro->scopestack_max * sizeof (I32); 689 rss += slot->scopestack_max * sizeof (I32);
601 rss += coro->savestack_max * sizeof (ANY); 690 rss += slot->savestack_max * sizeof (ANY);
602 691
603#if !PERL_VERSION_ATLEAST (5,9,0) 692#if !PERL_VERSION_ATLEAST (5,10,0)
604 rss += coro->retstack_max * sizeof (OP *); 693 rss += slot->retstack_max * sizeof (OP *);
605#endif 694#endif
695 }
606 } 696 }
607 697
608 return rss; 698 return rss;
609} 699}
610 700
611/** coroutine stack handling ************************************************/ 701/** coroutine stack handling ************************************************/
612 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
613static void 793static void
614setup_coro (pTHX_ struct coro *coro) 794coro_setup (pTHX_ struct coro *coro)
615{ 795{
616 /* 796 /*
617 * emulate part of the perl startup here. 797 * emulate part of the perl startup here.
618 */ 798 */
619 coro_init_stacks (aTHX); 799 coro_init_stacks (aTHX);
… …
621 PL_runops = RUNOPS_DEFAULT; 801 PL_runops = RUNOPS_DEFAULT;
622 PL_curcop = &PL_compiling; 802 PL_curcop = &PL_compiling;
623 PL_in_eval = EVAL_NULL; 803 PL_in_eval = EVAL_NULL;
624 PL_comppad = 0; 804 PL_comppad = 0;
625 PL_curpm = 0; 805 PL_curpm = 0;
806 PL_curpad = 0;
626 PL_localizing = 0; 807 PL_localizing = 0;
627 PL_dirty = 0; 808 PL_dirty = 0;
628 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);
629 824
630 { 825 {
631 dSP; 826 dSP;
632 LOGOP myop; 827 LOGOP myop;
633 828
634 SvREFCNT_dec (GvAV (PL_defgv));
635 GvAV (PL_defgv) = coro->args; coro->args = 0;
636
637 Zero (&myop, 1, LOGOP); 829 Zero (&myop, 1, LOGOP);
638 myop.op_next = Nullop; 830 myop.op_next = Nullop;
639 myop.op_flags = OPf_WANT_VOID; 831 myop.op_flags = OPf_WANT_VOID;
640 832
641 PUSHMARK (SP); 833 PUSHMARK (SP);
642 XPUSHs (av_shift (GvAV (PL_defgv))); 834 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
643 PUTBACK; 835 PUTBACK;
644 PL_op = (OP *)&myop; 836 PL_op = (OP *)&myop;
645 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 837 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
646 SPAGAIN; 838 SPAGAIN;
647 } 839 }
648 840
649 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);
650} 883}
651 884
652static void 885static void
653free_coro_mortal (pTHX) 886free_coro_mortal (pTHX)
654{ 887{
655 if (coro_mortal) 888 if (expect_true (coro_mortal))
656 { 889 {
657 SvREFCNT_dec (coro_mortal); 890 SvREFCNT_dec (coro_mortal);
658 coro_mortal = 0; 891 coro_mortal = 0;
659 } 892 }
660} 893}
… …
669 902
670 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX))) 903 while ((PL_op = CALL_FPTR (PL_op->op_ppaddr) (aTHX)))
671 { 904 {
672 PERL_ASYNC_CHECK (); 905 PERL_ASYNC_CHECK ();
673 906
674 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB) 907 if (cctx->flags & CC_TRACE_ALL)
675 { 908 {
676 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 909 if (PL_op->op_type == OP_LEAVESUB && cctx->flags & CC_TRACE_SUB)
677 SV **bot, **top;
678 AV *av = newAV (); /* return values */
679 SV **cb;
680 runops_proc_t old_runops = PL_runops;
681 dSP;
682 ENTER;
683 SAVETMPS;
684 EXTEND (SP, 3);
685 PL_runops = RUNOPS_DEFAULT;
686
687 GV *gv = CvGV (cx->blk_sub.cv);
688 SV *fullname = sv_2mortal (newSV (0));
689 if (isGV (gv))
690 gv_efullname3 (fullname, gv, 0);
691
692 bot = PL_stack_base + cx->blk_oldsp + 1;
693 top = cx->blk_gimme == G_ARRAY ? SP + 1
694 : cx->blk_gimme == G_SCALAR ? bot + 1
695 : bot;
696
697 while (bot < top)
698 av_push (av, SvREFCNT_inc (*bot++));
699
700 PUSHMARK (SP);
701 PUSHs (&PL_sv_no);
702 PUSHs (fullname);
703 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
704 PUTBACK;
705 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
706 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
707 SPAGAIN;
708
709 FREETMPS;
710 LEAVE;
711 PL_runops = old_runops;
712 }
713
714 if (oldcop != PL_curcop)
715 {
716 oldcop = PL_curcop;
717
718 if (PL_curcop != &PL_compiling)
719 { 910 {
911 PERL_CONTEXT *cx = &cxstack[cxstack_ix];
912 SV **bot, **top;
913 AV *av = newAV (); /* return values */
720 SV **cb; 914 SV **cb;
721 runops_proc_t old_runops = PL_runops;
722 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;
723 ENTER; 932 ENTER;
724 SAVETMPS; 933 SAVETMPS;
725 EXTEND (SP, 3); 934 EXTEND (SP, 3);
726 PL_runops = RUNOPS_DEFAULT; 935 PUSHMARK (SP);
936 PUSHs (&PL_sv_no);
937 PUSHs (fullname);
938 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
939 PUTBACK;
940 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
941 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
942 SPAGAIN;
943 FREETMPS;
944 LEAVE;
945 PL_runops = runops_trace;
946 }
727 947
728 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB) 948 if (oldcop != PL_curcop)
949 {
950 oldcop = PL_curcop;
951
952 if (PL_curcop != &PL_compiling)
729 { 953 {
730 PERL_CONTEXT *cx = &cxstack[cxstack_ix]; 954 SV **cb;
731 955
732 if (CxTYPE (cx) == CXt_SUB && oldcxix < cxstack_ix) 956 if (oldcxix != cxstack_ix && cctx->flags & CC_TRACE_SUB)
733 { 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;
734 GV *gv = CvGV (cx->blk_sub.cv); 964 GV *gv = CvGV (cx->blk_sub.cv);
735 SV *fullname = sv_2mortal (newSV (0)); 965 SV *fullname = sv_2mortal (newSV (0));
966
736 if (isGV (gv)) 967 if (isGV (gv))
737 gv_efullname3 (fullname, gv, 0); 968 gv_efullname3 (fullname, gv, 0);
738 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;
739 PUSHMARK (SP); 999 PUSHMARK (SP);
740 PUSHs (&PL_sv_yes); 1000 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
741 PUSHs (fullname); 1001 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
742 PUSHs (cx->blk_sub.hasargs ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef);
743 PUTBACK; 1002 PUTBACK;
744 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1003 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
745 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1004 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
746 SPAGAIN; 1005 SPAGAIN;
1006 FREETMPS;
1007 LEAVE;
1008 PL_runops = runops_trace;
747 } 1009 }
748
749 oldcxix = cxstack_ix;
750 } 1010 }
751
752 if (cctx->flags & CC_TRACE_LINE)
753 {
754 PUSHMARK (SP);
755 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
756 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
757 PUTBACK;
758 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
759 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
760 SPAGAIN;
761 }
762
763 FREETMPS;
764 LEAVE;
765 PL_runops = old_runops;
766 } 1011 }
767 } 1012 }
768 } 1013 }
769 1014
770 TAINT_NOT; 1015 TAINT_NOT;
… …
773 1018
774/* 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 */
775/* _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 */
776/* during execution of a perl program */ 1021/* during execution of a perl program */
777static void NOINLINE 1022static void NOINLINE
778prepare_cctx (pTHX_ coro_cctx *cctx) 1023cctx_prepare (pTHX_ coro_cctx *cctx)
779{ 1024{
780 dSP; 1025 dSP;
781 LOGOP myop; 1026 LOGOP myop;
782 1027
783 PL_top_env = &PL_start_env; 1028 PL_top_env = &PL_start_env;
… …
801 1046
802/* 1047/*
803 * this is a _very_ stripped down perl interpreter ;) 1048 * this is a _very_ stripped down perl interpreter ;)
804 */ 1049 */
805static void 1050static void
806coro_run (void *arg) 1051cctx_run (void *arg)
807{ 1052{
808 dTHX; 1053 dTHX;
809 1054
810 /* coro_run is the alternative tail of transfer(), so unlock here. */ 1055 /* cctx_run is the alternative tail of transfer(), so unlock here. */
811 UNLOCK; 1056 UNLOCK;
812 1057
813 /* we now skip the entersub that lead to transfer() */ 1058 /* we now skip the entersub that lead to transfer() */
814 PL_op = PL_op->op_next; 1059 PL_op = PL_op->op_next;
815 1060
816 /* inject a fake subroutine call to cctx_init */ 1061 /* inject a fake subroutine call to cctx_init */
817 prepare_cctx (aTHX_ (coro_cctx *)arg); 1062 cctx_prepare (aTHX_ (coro_cctx *)arg);
818 1063
819 /* 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 */
820 PL_restartop = PL_op; 1065 PL_restartop = PL_op;
821 perl_run (PL_curinterp); 1066 perl_run (PL_curinterp);
822 1067
… …
837 coro_cctx *cctx; 1082 coro_cctx *cctx;
838 void *stack_start; 1083 void *stack_start;
839 size_t stack_size; 1084 size_t stack_size;
840 1085
841 ++cctx_count; 1086 ++cctx_count;
842
843 Newz (0, cctx, 1, coro_cctx); 1087 Newz (0, cctx, 1, coro_cctx);
844 1088
1089 cctx->gen = cctx_gen;
1090
845#if HAVE_MMAP 1091#if HAVE_MMAP
846
847 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;
848 /* mmap supposedly does allocate-on-write for us */ 1093 /* mmap supposedly does allocate-on-write for us */
849 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);
850 1095
851 if (cctx->sptr != (void *)-1) 1096 if (cctx->sptr != (void *)-1)
852 { 1097 {
… …
858 cctx->flags |= CC_MAPPED; 1103 cctx->flags |= CC_MAPPED;
859 } 1104 }
860 else 1105 else
861#endif 1106#endif
862 { 1107 {
863 cctx->ssize = coro_stacksize * (long)sizeof (long); 1108 cctx->ssize = cctx_stacksize * (long)sizeof (long);
864 New (0, cctx->sptr, coro_stacksize, long); 1109 New (0, cctx->sptr, cctx_stacksize, long);
865 1110
866 if (!cctx->sptr) 1111 if (!cctx->sptr)
867 { 1112 {
868 perror ("FATAL: unable to allocate stack for coroutine"); 1113 perror ("FATAL: unable to allocate stack for coroutine");
869 _exit (EXIT_FAILURE); 1114 _exit (EXIT_FAILURE);
… …
872 stack_start = cctx->sptr; 1117 stack_start = cctx->sptr;
873 stack_size = cctx->ssize; 1118 stack_size = cctx->ssize;
874 } 1119 }
875 1120
876 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size); 1121 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
877 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);
878 1123
879 return cctx; 1124 return cctx;
880} 1125}
881 1126
882static void 1127static void
… …
884{ 1129{
885 if (!cctx) 1130 if (!cctx)
886 return; 1131 return;
887 1132
888 --cctx_count; 1133 --cctx_count;
1134 coro_destroy (&cctx->cctx);
889 1135
1136 /* coro_transfer creates new, empty cctx's */
1137 if (cctx->sptr)
1138 {
890#if CORO_USE_VALGRIND 1139#if CORO_USE_VALGRIND
891 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1140 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
892#endif 1141#endif
893 1142
894#if HAVE_MMAP 1143#if HAVE_MMAP
895 if (cctx->flags & CC_MAPPED) 1144 if (cctx->flags & CC_MAPPED)
896 munmap (cctx->sptr, cctx->ssize); 1145 munmap (cctx->sptr, cctx->ssize);
897 else 1146 else
898#endif 1147#endif
899 Safefree (cctx->sptr); 1148 Safefree (cctx->sptr);
1149 }
900 1150
901 Safefree (cctx); 1151 Safefree (cctx);
902} 1152}
1153
1154/* wether this cctx should be destructed */
1155#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
903 1156
904static coro_cctx * 1157static coro_cctx *
905cctx_get (pTHX) 1158cctx_get (pTHX)
906{ 1159{
907 while (cctx_first) 1160 while (expect_true (cctx_first))
908 { 1161 {
909 coro_cctx *cctx = cctx_first; 1162 coro_cctx *cctx = cctx_first;
910 cctx_first = cctx->next; 1163 cctx_first = cctx->next;
911 --cctx_idle; 1164 --cctx_idle;
912 1165
913 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 1166 if (expect_true (!CCTX_EXPIRED (cctx)))
914 return cctx; 1167 return cctx;
915 1168
916 cctx_destroy (cctx); 1169 cctx_destroy (cctx);
917 } 1170 }
918 1171
… …
920} 1173}
921 1174
922static void 1175static void
923cctx_put (coro_cctx *cctx) 1176cctx_put (coro_cctx *cctx)
924{ 1177{
1178 assert (("cctx_put called on non-initialised cctx", cctx->sptr));
1179
925 /* free another cctx if overlimit */ 1180 /* free another cctx if overlimit */
926 if (cctx_idle >= MAX_IDLE_CCTX) 1181 if (expect_false (cctx_idle >= cctx_max_idle))
927 { 1182 {
928 coro_cctx *first = cctx_first; 1183 coro_cctx *first = cctx_first;
929 cctx_first = first->next; 1184 cctx_first = first->next;
930 --cctx_idle; 1185 --cctx_idle;
931 1186
… …
937 cctx_first = cctx; 1192 cctx_first = cctx;
938} 1193}
939 1194
940/** coroutine switching *****************************************************/ 1195/** coroutine switching *****************************************************/
941 1196
942static void NOINLINE 1197static void
943transfer_check (pTHX_ struct coro *prev, struct coro *next) 1198transfer_check (pTHX_ struct coro *prev, struct coro *next)
944{ 1199{
945 if (prev != next) 1200 if (expect_true (prev != next))
946 { 1201 {
947 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 1202 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
948 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");
949 1204
950 if (next->flags & CF_RUNNING) 1205 if (expect_false (next->flags & CF_RUNNING))
951 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");
952 1207
953 if (next->flags & CF_DESTROYED) 1208 if (expect_false (next->flags & CF_DESTROYED))
954 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");
955 1210
1211#if !PERL_VERSION_ATLEAST (5,10,0)
956 if (PL_lex_state != LEX_NOTPARSING) 1212 if (expect_false (PL_lex_state != LEX_NOTPARSING))
957 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
958 } 1215 }
959} 1216}
960 1217
961/* always use the TRANSFER macro */ 1218/* always use the TRANSFER macro */
962static void NOINLINE 1219static void NOINLINE
963transfer (pTHX_ struct coro *prev, struct coro *next) 1220transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
964{ 1221{
965 dSTACKLEVEL; 1222 dSTACKLEVEL;
966 1223
967 /* sometimes transfer is only called to set idle_sp */ 1224 /* sometimes transfer is only called to set idle_sp */
968 if (!next) 1225 if (expect_false (!next))
969 { 1226 {
970 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1227 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
971 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 */
972 } 1229 }
973 else if (prev != next) 1230 else if (expect_true (prev != next))
974 { 1231 {
1232 static volatile int has_throw;
975 coro_cctx *prev__cctx; 1233 coro_cctx *prev__cctx;
976 1234
977 if (prev->flags & CF_NEW) 1235 if (expect_false (prev->flags & CF_NEW))
978 { 1236 {
979 /* create a new empty context */ 1237 /* create a new empty/source context */
1238 ++cctx_count;
980 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
981 prev->flags &= ~CF_NEW; 1243 prev->flags &= ~CF_NEW;
982 prev->flags |= CF_RUNNING; 1244 prev->flags |= CF_RUNNING;
983 } 1245 }
984 1246
985 prev->flags &= ~CF_RUNNING; 1247 prev->flags &= ~CF_RUNNING;
986 next->flags |= CF_RUNNING; 1248 next->flags |= CF_RUNNING;
987 1249
988 LOCK; 1250 LOCK;
989 1251
1252 /* first get rid of the old state */
1253 save_perl (aTHX_ prev);
1254
990 if (next->flags & CF_NEW) 1255 if (expect_false (next->flags & CF_NEW))
991 { 1256 {
992 /* need to start coroutine */ 1257 /* need to start coroutine */
993 next->flags &= ~CF_NEW; 1258 next->flags &= ~CF_NEW;
994 /* first get rid of the old state */
995 save_perl (aTHX_ prev);
996 /* setup coroutine call */ 1259 /* setup coroutine call */
997 setup_coro (aTHX_ next); 1260 coro_setup (aTHX_ next);
998 } 1261 }
999 else 1262 else
1000 {
1001 /* coroutine already started */
1002 save_perl (aTHX_ prev);
1003 load_perl (aTHX_ next); 1263 load_perl (aTHX_ next);
1004 }
1005 1264
1006 prev__cctx = prev->cctx; 1265 prev__cctx = prev->cctx;
1007 1266
1008 /* possibly "free" the cctx */ 1267 /* possibly "free" the cctx */
1009 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 ))
1010 { 1273 {
1011 /* 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 */
1012 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));
1013 1276
1014 prev->cctx = 0; 1277 prev->cctx = 0;
1015 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
1016 cctx_put (prev__cctx); 1285 cctx_put (prev__cctx);
1017 } 1286 }
1018 1287
1288 ++next->usecount;
1289
1019 if (!next->cctx) 1290 if (expect_true (!next->cctx))
1020 next->cctx = cctx_get (aTHX); 1291 next->cctx = cctx_get (aTHX);
1021 1292
1293 has_throw = !!next->throw;
1294
1022 if (prev__cctx != next->cctx) 1295 if (expect_false (prev__cctx != next->cctx))
1023 { 1296 {
1024 prev__cctx->top_env = PL_top_env; 1297 prev__cctx->top_env = PL_top_env;
1025 PL_top_env = next->cctx->top_env; 1298 PL_top_env = next->cctx->top_env;
1026 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1299 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1027 } 1300 }
1028 1301
1029 free_coro_mortal (aTHX); 1302 free_coro_mortal (aTHX);
1030 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 }
1031 } 1317 }
1032} 1318}
1033 1319
1034struct transfer_args 1320struct transfer_args
1035{ 1321{
1036 struct coro *prev, *next; 1322 struct coro *prev, *next;
1037}; 1323};
1038 1324
1039#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next) 1325#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1040#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1326#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1041 1327
1042/** high level stuff ********************************************************/ 1328/** high level stuff ********************************************************/
1043 1329
1044static int 1330static int
… …
1062 1348
1063 if (coro->mainstack && coro->mainstack != main_mainstack) 1349 if (coro->mainstack && coro->mainstack != main_mainstack)
1064 { 1350 {
1065 struct coro temp; 1351 struct coro temp;
1066 1352
1067 assert (!(coro->flags & CF_RUNNING));
1068
1069 Zero (&temp, 1, struct coro);
1070 temp.save = CORO_SAVE_ALL;
1071
1072 if (coro->flags & CF_RUNNING) 1353 if (coro->flags & CF_RUNNING)
1073 croak ("FATAL: tried to destroy currently running coroutine"); 1354 croak ("FATAL: tried to destroy currently running coroutine");
1074 1355
1075 save_perl (aTHX_ &temp); 1356 save_perl (aTHX_ &temp);
1076 load_perl (aTHX_ coro); 1357 load_perl (aTHX_ coro);
1077 1358
1078 coro_destroy_stacks (aTHX); 1359 coro_destruct (aTHX_ coro);
1079 1360
1080 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */ 1361 load_perl (aTHX_ &temp);
1081 1362
1082 coro->mainstack = 0; 1363 coro->slot = 0;
1083 } 1364 }
1084 1365
1085 cctx_destroy (coro->cctx); 1366 cctx_destroy (coro->cctx);
1086 SvREFCNT_dec (coro->args); 1367 SvREFCNT_dec (coro->args);
1087 1368
… …
1143{ 1424{
1144 dTHX; 1425 dTHX;
1145 struct transfer_args ta; 1426 struct transfer_args ta;
1146 1427
1147 prepare_transfer (aTHX_ &ta, prev_sv, next_sv); 1428 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
1148 TRANSFER (ta); 1429 TRANSFER (ta, 1);
1149}
1150
1151static int
1152api_save (SV *coro_sv, int new_save)
1153{
1154 dTHX;
1155 struct coro *coro = SvSTATE (coro_sv);
1156 int old_save = coro->save;
1157
1158 if (new_save >= 0)
1159 coro->save = new_save;
1160
1161 return old_save;
1162} 1430}
1163 1431
1164/** Coro ********************************************************************/ 1432/** Coro ********************************************************************/
1165 1433
1166static void 1434static void
… …
1168{ 1436{
1169 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);
1170} 1438}
1171 1439
1172static SV * 1440static SV *
1173coro_deq (pTHX_ int min_prio) 1441coro_deq (pTHX)
1174{ 1442{
1175 int prio = PRIO_MAX - PRIO_MIN; 1443 int prio;
1176 1444
1177 min_prio -= PRIO_MIN;
1178 if (min_prio < 0)
1179 min_prio = 0;
1180
1181 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 1445 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1182 if (AvFILLp (coro_ready [prio]) >= 0) 1446 if (AvFILLp (coro_ready [prio]) >= 0)
1183 return av_shift (coro_ready [prio]); 1447 return av_shift (coro_ready [prio]);
1184 1448
1185 return 0; 1449 return 0;
1186} 1450}
… …
1188static int 1452static int
1189api_ready (SV *coro_sv) 1453api_ready (SV *coro_sv)
1190{ 1454{
1191 dTHX; 1455 dTHX;
1192 struct coro *coro; 1456 struct coro *coro;
1457 SV *sv_hook;
1458 void (*xs_hook)(void);
1193 1459
1194 if (SvROK (coro_sv)) 1460 if (SvROK (coro_sv))
1195 coro_sv = SvRV (coro_sv); 1461 coro_sv = SvRV (coro_sv);
1196 1462
1197 coro = SvSTATE (coro_sv); 1463 coro = SvSTATE (coro_sv);
… …
1200 return 0; 1466 return 0;
1201 1467
1202 coro->flags |= CF_READY; 1468 coro->flags |= CF_READY;
1203 1469
1204 LOCK; 1470 LOCK;
1471
1472 sv_hook = coro_nready ? 0 : coro_readyhook;
1473 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1474
1205 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1475 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1206 ++coro_nready; 1476 ++coro_nready;
1477
1207 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 ();
1208 1498
1209 return 1; 1499 return 1;
1210} 1500}
1211 1501
1212static int 1502static int
… …
1222 SV *prev_sv, *next_sv; 1512 SV *prev_sv, *next_sv;
1223 1513
1224 for (;;) 1514 for (;;)
1225 { 1515 {
1226 LOCK; 1516 LOCK;
1227 next_sv = coro_deq (aTHX_ PRIO_MIN); 1517 next_sv = coro_deq (aTHX);
1228 1518
1229 /* nothing to schedule: call the idle handler */ 1519 /* nothing to schedule: call the idle handler */
1230 if (!next_sv) 1520 if (expect_false (!next_sv))
1231 { 1521 {
1232 dSP; 1522 dSP;
1233 UNLOCK; 1523 UNLOCK;
1234 1524
1235 ENTER; 1525 ENTER;
1236 SAVETMPS; 1526 SAVETMPS;
1237 1527
1238 PUSHMARK (SP); 1528 PUSHMARK (SP);
1239 PUTBACK; 1529 PUTBACK;
1240 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD); 1530 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1531 SPAGAIN;
1241 1532
1242 FREETMPS; 1533 FREETMPS;
1243 LEAVE; 1534 LEAVE;
1244 continue; 1535 continue;
1245 } 1536 }
1246 1537
1247 ta->next = SvSTATE (next_sv); 1538 ta->next = SvSTATE (next_sv);
1248 1539
1249 /* cannot transfer to destroyed coros, skip and look for next */ 1540 /* cannot transfer to destroyed coros, skip and look for next */
1250 if (ta->next->flags & CF_DESTROYED) 1541 if (expect_false (ta->next->flags & CF_DESTROYED))
1251 { 1542 {
1252 UNLOCK; 1543 UNLOCK;
1253 SvREFCNT_dec (next_sv); 1544 SvREFCNT_dec (next_sv);
1254 /* coro_nready is already taken care of by destroy */ 1545 /* coro_nready is already taken care of by destroy */
1255 continue; 1546 continue;
… …
1300{ 1591{
1301 dTHX; 1592 dTHX;
1302 struct transfer_args ta; 1593 struct transfer_args ta;
1303 1594
1304 prepare_schedule (aTHX_ &ta); 1595 prepare_schedule (aTHX_ &ta);
1305 TRANSFER (ta); 1596 TRANSFER (ta, 1);
1306} 1597}
1307 1598
1308static int 1599static int
1309api_cede (void) 1600api_cede (void)
1310{ 1601{
1311 dTHX; 1602 dTHX;
1312 struct transfer_args ta; 1603 struct transfer_args ta;
1313 1604
1314 prepare_cede (aTHX_ &ta); 1605 prepare_cede (aTHX_ &ta);
1315 1606
1316 if (ta.prev != ta.next) 1607 if (expect_true (ta.prev != ta.next))
1317 { 1608 {
1318 TRANSFER (ta); 1609 TRANSFER (ta, 1);
1319 return 1; 1610 return 1;
1320 } 1611 }
1321 else 1612 else
1322 return 0; 1613 return 0;
1323} 1614}
… …
1328 dTHX; 1619 dTHX;
1329 struct transfer_args ta; 1620 struct transfer_args ta;
1330 1621
1331 if (prepare_cede_notself (aTHX_ &ta)) 1622 if (prepare_cede_notself (aTHX_ &ta))
1332 { 1623 {
1333 TRANSFER (ta); 1624 TRANSFER (ta, 1);
1334 return 1; 1625 return 1;
1335 } 1626 }
1336 else 1627 else
1337 return 0; 1628 return 0;
1338} 1629}
1339 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
1657#if 0
1658static int
1659coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1660{
1661 AV *padlist;
1662 AV *av = (AV *)mg->mg_obj;
1663
1664 abort ();
1665
1666 return 0;
1667}
1668
1669static MGVTBL coro_gensub_vtbl = {
1670 0, 0, 0, 0,
1671 coro_gensub_free
1672};
1673#endif
1674
1675/*****************************************************************************/
1676/* PerlIO::cede */
1677
1678typedef struct
1679{
1680 PerlIOBuf base;
1681 NV next, every;
1682} PerlIOCede;
1683
1684static IV
1685PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
1686{
1687 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1688
1689 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
1690 self->next = nvtime () + self->every;
1691
1692 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
1693}
1694
1695static SV *
1696PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
1697{
1698 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1699
1700 return newSVnv (self->every);
1701}
1702
1703static IV
1704PerlIOCede_flush (pTHX_ PerlIO *f)
1705{
1706 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1707 double now = nvtime ();
1708
1709 if (now >= self->next)
1710 {
1711 api_cede ();
1712 self->next = now + self->every;
1713 }
1714
1715 return PerlIOBuf_flush (aTHX_ f);
1716}
1717
1718static PerlIO_funcs PerlIO_cede =
1719{
1720 sizeof(PerlIO_funcs),
1721 "cede",
1722 sizeof(PerlIOCede),
1723 PERLIO_K_DESTRUCT | PERLIO_K_RAW,
1724 PerlIOCede_pushed,
1725 PerlIOBuf_popped,
1726 PerlIOBuf_open,
1727 PerlIOBase_binmode,
1728 PerlIOCede_getarg,
1729 PerlIOBase_fileno,
1730 PerlIOBuf_dup,
1731 PerlIOBuf_read,
1732 PerlIOBuf_unread,
1733 PerlIOBuf_write,
1734 PerlIOBuf_seek,
1735 PerlIOBuf_tell,
1736 PerlIOBuf_close,
1737 PerlIOCede_flush,
1738 PerlIOBuf_fill,
1739 PerlIOBase_eof,
1740 PerlIOBase_error,
1741 PerlIOBase_clearerr,
1742 PerlIOBase_setlinebuf,
1743 PerlIOBuf_get_base,
1744 PerlIOBuf_bufsiz,
1745 PerlIOBuf_get_ptr,
1746 PerlIOBuf_get_cnt,
1747 PerlIOBuf_set_ptrcnt,
1748};
1749
1750
1340MODULE = Coro::State PACKAGE = Coro::State 1751MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1341 1752
1342PROTOTYPES: DISABLE 1753PROTOTYPES: DISABLE
1343 1754
1344BOOT: 1755BOOT:
1345{ 1756{
1346#ifdef USE_ITHREADS 1757#ifdef USE_ITHREADS
1347 MUTEX_INIT (&coro_mutex); 1758 MUTEX_INIT (&coro_lock);
1348#endif 1759#endif
1349 BOOT_PAGESIZE; 1760 BOOT_PAGESIZE;
1761
1762 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1763 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
1764
1765 orig_sigelem_get = PL_vtbl_sigelem.svt_get; PL_vtbl_sigelem.svt_get = coro_sigelem_get;
1766 orig_sigelem_set = PL_vtbl_sigelem.svt_set; PL_vtbl_sigelem.svt_set = coro_sigelem_set;
1767 orig_sigelem_clr = PL_vtbl_sigelem.svt_clear; PL_vtbl_sigelem.svt_clear = coro_sigelem_clr;
1768
1769 hv_sig = coro_get_hv (aTHX_ "SIG", TRUE);
1770 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
1771 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
1350 1772
1351 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 1773 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
1352 1774
1353 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 1775 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
1354 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 1776 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
1355 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 1777 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
1356 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 1778 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
1357 1779
1358 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (CORO_SAVE_DEFAV));
1359 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (CORO_SAVE_DEFSV));
1360 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (CORO_SAVE_ERRSV));
1361 newCONSTSUB (coro_state_stash, "SAVE_IRSSV", newSViv (CORO_SAVE_IRSSV));
1362 newCONSTSUB (coro_state_stash, "SAVE_DEFFH", newSViv (CORO_SAVE_DEFFH));
1363 newCONSTSUB (coro_state_stash, "SAVE_DEF", newSViv (CORO_SAVE_DEF));
1364 newCONSTSUB (coro_state_stash, "SAVE_ALL", newSViv (CORO_SAVE_ALL));
1365
1366 main_mainstack = PL_mainstack; 1780 main_mainstack = PL_mainstack;
1367 main_top_env = PL_top_env; 1781 main_top_env = PL_top_env;
1368 1782
1369 while (main_top_env->je_prev) 1783 while (main_top_env->je_prev)
1370 main_top_env = main_top_env->je_prev; 1784 main_top_env = main_top_env->je_prev;
1371 1785
1372 coroapi.ver = CORO_API_VERSION; 1786 coroapi.ver = CORO_API_VERSION;
1787 coroapi.rev = CORO_API_REVISION;
1373 coroapi.transfer = api_transfer; 1788 coroapi.transfer = api_transfer;
1789
1790 {
1791 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1792
1793 if (!svp) croak ("Time::HiRes is required");
1794 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
1795
1796 nvtime = INT2PTR (double (*)(), SvIV (*svp));
1797 }
1374 1798
1375 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1799 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1376} 1800}
1377 1801
1378SV * 1802SV *
1379new (char *klass, ...) 1803new (char *klass, ...)
1380 CODE: 1804 CODE:
1381{ 1805{
1382 struct coro *coro; 1806 struct coro *coro;
1807 MAGIC *mg;
1383 HV *hv; 1808 HV *hv;
1384 int i; 1809 int i;
1385 1810
1386 Newz (0, coro, 1, struct coro); 1811 Newz (0, coro, 1, struct coro);
1387 coro->args = newAV (); 1812 coro->args = newAV ();
1388 coro->save = CORO_SAVE_DEF;
1389 coro->flags = CF_NEW; 1813 coro->flags = CF_NEW;
1390 1814
1391 if (coro_first) coro_first->prev = coro; 1815 if (coro_first) coro_first->prev = coro;
1392 coro->next = coro_first; 1816 coro->next = coro_first;
1393 coro_first = coro; 1817 coro_first = coro;
1394 1818
1395 coro->hv = hv = newHV (); 1819 coro->hv = hv = newHV ();
1396 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1820 mg = sv_magicext ((SV *)hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)coro, 0);
1821 mg->mg_flags |= MGf_DUP;
1397 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1822 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1398 1823
1824 av_extend (coro->args, items - 1);
1399 for (i = 1; i < items; i++) 1825 for (i = 1; i < items; i++)
1400 av_push (coro->args, newSVsv (ST (i))); 1826 av_push (coro->args, newSVsv (ST (i)));
1401} 1827}
1402 OUTPUT: 1828 OUTPUT:
1403 RETVAL 1829 RETVAL
1404 1830
1405int 1831# these not obviously related functions are all rolled into the same xs
1406save (SV *coro, int new_save = -1) 1832# function to increase chances that they all will call transfer with the same
1407 CODE: 1833# stack offset
1408 RETVAL = api_save (coro, new_save);
1409 OUTPUT:
1410 RETVAL
1411
1412int
1413save_also (SV *coro_sv, int save_also)
1414 CODE:
1415{
1416 struct coro *coro = SvSTATE (coro_sv);
1417 RETVAL = coro->save;
1418 coro->save |= save_also;
1419}
1420 OUTPUT:
1421 RETVAL
1422
1423void 1834void
1424_set_stacklevel (...) 1835_set_stacklevel (...)
1425 ALIAS: 1836 ALIAS:
1426 Coro::State::transfer = 1 1837 Coro::State::transfer = 1
1427 Coro::schedule = 2 1838 Coro::schedule = 2
… …
1429 Coro::cede_notself = 4 1840 Coro::cede_notself = 4
1430 CODE: 1841 CODE:
1431{ 1842{
1432 struct transfer_args ta; 1843 struct transfer_args ta;
1433 1844
1845 PUTBACK;
1434 switch (ix) 1846 switch (ix)
1435 { 1847 {
1436 case 0: 1848 case 0:
1437 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0))); 1849 ta.prev = (struct coro *)INT2PTR (coro_cctx *, SvIV (ST (0)));
1438 ta.next = 0; 1850 ta.next = 0;
1439 break; 1851 break;
1440 1852
1441 case 1: 1853 case 1:
1442 if (items != 2) 1854 if (items != 2)
1443 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1855 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d", items);
1444 1856
1445 prepare_transfer (aTHX_ &ta, ST (0), ST (1)); 1857 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1446 break; 1858 break;
1447 1859
1448 case 2: 1860 case 2:
… …
1457 if (!prepare_cede_notself (aTHX_ &ta)) 1869 if (!prepare_cede_notself (aTHX_ &ta))
1458 XSRETURN_EMPTY; 1870 XSRETURN_EMPTY;
1459 1871
1460 break; 1872 break;
1461 } 1873 }
1874 SPAGAIN;
1462 1875
1463 BARRIER; 1876 BARRIER;
1877 PUTBACK;
1464 TRANSFER (ta); 1878 TRANSFER (ta, 0);
1465 1879 SPAGAIN; /* might be the sp of a different coroutine now */
1466 if (GIMME_V != G_VOID && ta.next != ta.prev) 1880 /* be extra careful not to ever do anything after TRANSFER */
1467 XSRETURN_YES;
1468} 1881}
1469 1882
1470bool 1883bool
1471_destroy (SV *coro_sv) 1884_destroy (SV *coro_sv)
1472 CODE: 1885 CODE:
1473 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv)); 1886 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1474 OUTPUT: 1887 OUTPUT:
1475 RETVAL 1888 RETVAL
1476 1889
1477void 1890void
1478_exit (code) 1891_exit (int code)
1479 int code
1480 PROTOTYPE: $ 1892 PROTOTYPE: $
1481 CODE: 1893 CODE:
1482 _exit (code); 1894 _exit (code);
1483 1895
1484int 1896int
1485cctx_stacksize (int new_stacksize = 0) 1897cctx_stacksize (int new_stacksize = 0)
1486 CODE: 1898 CODE:
1487 RETVAL = coro_stacksize; 1899 RETVAL = cctx_stacksize;
1488 if (new_stacksize) 1900 if (new_stacksize)
1901 {
1489 coro_stacksize = new_stacksize; 1902 cctx_stacksize = new_stacksize;
1903 ++cctx_gen;
1904 }
1905 OUTPUT:
1906 RETVAL
1907
1908int
1909cctx_max_idle (int max_idle = 0)
1910 CODE:
1911 RETVAL = cctx_max_idle;
1912 if (max_idle > 1)
1913 cctx_max_idle = max_idle;
1490 OUTPUT: 1914 OUTPUT:
1491 RETVAL 1915 RETVAL
1492 1916
1493int 1917int
1494cctx_count () 1918cctx_count ()
… …
1518call (Coro::State coro, SV *coderef) 1942call (Coro::State coro, SV *coderef)
1519 ALIAS: 1943 ALIAS:
1520 eval = 1 1944 eval = 1
1521 CODE: 1945 CODE:
1522{ 1946{
1523 if (coro->mainstack) 1947 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1524 { 1948 {
1525 struct coro temp; 1949 struct coro temp;
1526 Zero (&temp, 1, struct coro);
1527 temp.save = CORO_SAVE_ALL;
1528 1950
1529 if (!(coro->flags & CF_RUNNING)) 1951 if (!(coro->flags & CF_RUNNING))
1530 { 1952 {
1953 PUTBACK;
1531 save_perl (aTHX_ &temp); 1954 save_perl (aTHX_ &temp);
1532 load_perl (aTHX_ coro); 1955 load_perl (aTHX_ coro);
1533 } 1956 }
1534 1957
1535 { 1958 {
1536 dSP; 1959 dSP;
1537 ENTER; 1960 ENTER;
1538 SAVETMPS; 1961 SAVETMPS;
1962 PUTBACK;
1963 PUSHSTACK;
1539 PUSHMARK (SP); 1964 PUSHMARK (SP);
1540 PUTBACK; 1965
1541 if (ix) 1966 if (ix)
1542 eval_sv (coderef, 0); 1967 eval_sv (coderef, 0);
1543 else 1968 else
1544 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1969 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1970
1971 POPSTACK;
1545 SPAGAIN; 1972 SPAGAIN;
1546 FREETMPS; 1973 FREETMPS;
1547 LEAVE; 1974 LEAVE;
1548 PUTBACK; 1975 PUTBACK;
1549 } 1976 }
1550 1977
1551 if (!(coro->flags & CF_RUNNING)) 1978 if (!(coro->flags & CF_RUNNING))
1552 { 1979 {
1553 save_perl (aTHX_ coro); 1980 save_perl (aTHX_ coro);
1554 load_perl (aTHX_ &temp); 1981 load_perl (aTHX_ &temp);
1982 SPAGAIN;
1555 } 1983 }
1556 } 1984 }
1557} 1985}
1558 1986
1559SV * 1987SV *
1560is_ready (Coro::State coro) 1988is_ready (Coro::State coro)
1561 PROTOTYPE: $ 1989 PROTOTYPE: $
1562 ALIAS: 1990 ALIAS:
1563 is_ready = CF_READY 1991 is_ready = CF_READY
… …
1568 RETVAL = boolSV (coro->flags & ix); 1996 RETVAL = boolSV (coro->flags & ix);
1569 OUTPUT: 1997 OUTPUT:
1570 RETVAL 1998 RETVAL
1571 1999
1572void 2000void
1573trace (Coro::State coro, int flags = CC_TRACE | CC_TRACE_SUB) 2001api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
1574 CODE:
1575 if (flags & CC_TRACE)
1576 {
1577 if (!coro->cctx)
1578 coro->cctx = cctx_new ();
1579 else if (!(coro->cctx->flags & CC_TRACE))
1580 croak ("cannot enable tracing on coroutine with custom stack");
1581
1582 coro->cctx->flags |= flags & (CC_TRACE | CC_TRACE_ALL);
1583 }
1584 else
1585 if (coro->cctx && coro->cctx->flags & CC_TRACE)
1586 {
1587 coro->cctx->flags &= ~(CC_TRACE | CC_TRACE_ALL);
1588 coro->cctx->flags |= CC_NOREUSE;
1589
1590 if (coro->flags & CF_RUNNING)
1591 PL_runops = RUNOPS_DEFAULT;
1592 else
1593 coro->runops = RUNOPS_DEFAULT;
1594 }
1595 2002
1596SV * 2003SV *
1597has_stack (Coro::State coro) 2004has_cctx (Coro::State coro)
1598 PROTOTYPE: $ 2005 PROTOTYPE: $
1599 CODE: 2006 CODE:
1600 RETVAL = boolSV (!!coro->cctx); 2007 RETVAL = boolSV (!!coro->cctx);
1601 OUTPUT: 2008 OUTPUT:
1602 RETVAL 2009 RETVAL
… …
1607 CODE: 2014 CODE:
1608 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2015 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1609 OUTPUT: 2016 OUTPUT:
1610 RETVAL 2017 RETVAL
1611 2018
1612IV 2019UV
1613rss (Coro::State coro) 2020rss (Coro::State coro)
1614 PROTOTYPE: $ 2021 PROTOTYPE: $
2022 ALIAS:
2023 usecount = 1
1615 CODE: 2024 CODE:
2025 switch (ix)
2026 {
1616 RETVAL = coro_rss (aTHX_ coro); 2027 case 0: RETVAL = coro_rss (aTHX_ coro); break;
2028 case 1: RETVAL = coro->usecount; break;
2029 }
1617 OUTPUT: 2030 OUTPUT:
1618 RETVAL 2031 RETVAL
1619 2032
2033void
2034force_cctx ()
2035 CODE:
2036 struct coro *coro = SvSTATE (coro_current);
2037 coro->cctx->idle_sp = 0;
2038
2039void
2040swap_defsv (Coro::State self)
2041 PROTOTYPE: $
2042 ALIAS:
2043 swap_defav = 1
2044 CODE:
2045 if (!self->slot)
2046 croak ("cannot swap state with coroutine that has no saved state");
2047 else
2048 {
2049 SV **src = ix ? (SV **)&GvAV (PL_defgv) : &GvSV (PL_defgv);
2050 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
2051
2052 SV *tmp = *src; *src = *dst; *dst = tmp;
2053 }
1620 2054
1621MODULE = Coro::State PACKAGE = Coro 2055MODULE = Coro::State PACKAGE = Coro
1622 2056
1623BOOT: 2057BOOT:
1624{ 2058{
1625 int i; 2059 int i;
1626 2060
1627 sv_pool_rss = get_sv ("Coro::POOL_RSS" , TRUE);
1628 sv_pool_size = get_sv ("Coro::POOL_SIZE" , TRUE);
1629 av_async_pool = get_av ("Coro::async_pool", TRUE); 2061 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
2062 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
2063 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
1630 2064
1631 coro_current = get_sv ("Coro::current", FALSE); 2065 coro_current = coro_get_sv (aTHX_ "Coro::current", FALSE);
1632 SvREADONLY_on (coro_current); 2066 SvREADONLY_on (coro_current);
1633 2067
1634 coro_stash = gv_stashpv ("Coro", TRUE); 2068 coro_stash = gv_stashpv ("Coro", TRUE);
1635 2069
1636 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX)); 2070 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (PRIO_MAX));
1637 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 2071 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
1638 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 2072 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
1639 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 2073 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
… …
1642 2076
1643 for (i = PRIO_MAX - PRIO_MIN + 1; i--; ) 2077 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
1644 coro_ready[i] = newAV (); 2078 coro_ready[i] = newAV ();
1645 2079
1646 { 2080 {
1647 SV *sv = perl_get_sv("Coro::API", 1); 2081 SV *sv = perl_get_sv ("Coro::API", TRUE);
2082 perl_get_sv ("Coro::API", TRUE); /* silence 5.10 warning */
1648 2083
1649 coroapi.schedule = api_schedule; 2084 coroapi.schedule = api_schedule;
1650 coroapi.save = api_save;
1651 coroapi.cede = api_cede; 2085 coroapi.cede = api_cede;
1652 coroapi.cede_notself = api_cede_notself; 2086 coroapi.cede_notself = api_cede_notself;
1653 coroapi.ready = api_ready; 2087 coroapi.ready = api_ready;
1654 coroapi.is_ready = api_is_ready; 2088 coroapi.is_ready = api_is_ready;
1655 coroapi.nready = &coro_nready; 2089 coroapi.nready = &coro_nready;
… …
1664void 2098void
1665_set_current (SV *current) 2099_set_current (SV *current)
1666 PROTOTYPE: $ 2100 PROTOTYPE: $
1667 CODE: 2101 CODE:
1668 SvREFCNT_dec (SvRV (coro_current)); 2102 SvREFCNT_dec (SvRV (coro_current));
1669 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 2103 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
2104
2105void
2106_set_readyhook (SV *hook)
2107 PROTOTYPE: $
2108 CODE:
2109 LOCK;
2110 SvREFCNT_dec (coro_readyhook);
2111 coro_readyhook = SvOK (hook) ? newSVsv (hook) : 0;
2112 UNLOCK;
1670 2113
1671int 2114int
1672prio (Coro::State coro, int newprio = 0) 2115prio (Coro::State coro, int newprio = 0)
1673 ALIAS: 2116 ALIAS:
1674 nice = 1 2117 nice = 1
… …
1704 CODE: 2147 CODE:
1705 RETVAL = coro_nready; 2148 RETVAL = coro_nready;
1706 OUTPUT: 2149 OUTPUT:
1707 RETVAL 2150 RETVAL
1708 2151
2152void
2153throw (Coro::State self, SV *throw = &PL_sv_undef)
2154 PROTOTYPE: $;$
2155 CODE:
2156 SvREFCNT_dec (self->throw);
2157 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2158
1709# for async_pool speedup 2159# for async_pool speedup
1710void 2160void
1711_pool_1 (SV *cb) 2161_pool_1 (SV *cb)
1712 CODE: 2162 CODE:
1713{ 2163{
1714 int i, len; 2164 struct coro *coro = SvSTATE (coro_current);
1715 HV *hv = (HV *)SvRV (coro_current); 2165 HV *hv = (HV *)SvRV (coro_current);
1716 AV *defav = GvAV (PL_defgv); 2166 AV *defav = GvAV (PL_defgv);
1717 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0); 2167 SV *invoke = hv_delete (hv, "_invoke", sizeof ("_invoke") - 1, 0);
1718 AV *invoke_av; 2168 AV *invoke_av;
2169 int i, len;
1719 2170
1720 if (!invoke) 2171 if (!invoke)
2172 {
2173 SV *old = PL_diehook;
2174 PL_diehook = 0;
2175 SvREFCNT_dec (old);
1721 croak ("\3terminate\2\n"); 2176 croak ("\3async_pool terminate\2\n");
2177 }
2178
2179 SvREFCNT_dec (coro->saved_deffh);
2180 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
1722 2181
1723 hv_store (hv, "desc", sizeof ("desc") - 1, 2182 hv_store (hv, "desc", sizeof ("desc") - 1,
1724 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2183 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
1725 2184
1726 invoke_av = (AV *)SvRV (invoke); 2185 invoke_av = (AV *)SvRV (invoke);
… …
1730 2189
1731 if (len > 0) 2190 if (len > 0)
1732 { 2191 {
1733 av_fill (defav, len - 1); 2192 av_fill (defav, len - 1);
1734 for (i = 0; i < len; ++i) 2193 for (i = 0; i < len; ++i)
1735 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2194 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
1736 } 2195 }
1737 2196
1738 SvREFCNT_dec (invoke); 2197 SvREFCNT_dec (invoke);
1739} 2198}
1740 2199
… …
1744{ 2203{
1745 struct coro *coro = SvSTATE (coro_current); 2204 struct coro *coro = SvSTATE (coro_current);
1746 2205
1747 sv_setsv (cb, &PL_sv_undef); 2206 sv_setsv (cb, &PL_sv_undef);
1748 2207
2208 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2209 coro->saved_deffh = 0;
2210
1749 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2211 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
1750 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2212 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2213 {
2214 SV *old = PL_diehook;
2215 PL_diehook = 0;
2216 SvREFCNT_dec (old);
1751 croak ("\3terminate\2\n"); 2217 croak ("\3async_pool terminate\2\n");
2218 }
1752 2219
1753 av_clear (GvAV (PL_defgv)); 2220 av_clear (GvAV (PL_defgv));
1754 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1, 2221 hv_store ((HV *)SvRV (coro_current), "desc", sizeof ("desc") - 1,
1755 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0); 2222 newSVpvn ("[async_pool idle]", sizeof ("[async_pool idle]") - 1), 0);
1756 coro->save = CORO_SAVE_DEF; 2223
1757 coro->prio = 0; 2224 coro->prio = 0;
2225
2226 if (coro->cctx && (coro->cctx->flags & CC_TRACE))
2227 api_trace (coro_current, 0);
2228
1758 av_push (av_async_pool, newSVsv (coro_current)); 2229 av_push (av_async_pool, newSVsv (coro_current));
1759} 2230}
1760 2231
2232#if 0
2233
2234void
2235_generator_call (...)
2236 PROTOTYPE: @
2237 PPCODE:
2238 fprintf (stderr, "call %p\n", CvXSUBANY(cv).any_ptr);
2239 xxxx
2240 abort ();
2241
2242SV *
2243gensub (SV *sub, ...)
2244 PROTOTYPE: &;@
2245 CODE:
2246{
2247 struct coro *coro;
2248 MAGIC *mg;
2249 CV *xcv;
2250 CV *ncv = (CV *)newSV_type (SVt_PVCV);
2251 int i;
2252
2253 CvGV (ncv) = CvGV (cv);
2254 CvFILE (ncv) = CvFILE (cv);
2255
2256 Newz (0, coro, 1, struct coro);
2257 coro->args = newAV ();
2258 coro->flags = CF_NEW;
2259
2260 av_extend (coro->args, items - 1);
2261 for (i = 1; i < items; i++)
2262 av_push (coro->args, newSVsv (ST (i)));
2263
2264 CvISXSUB_on (ncv);
2265 CvXSUBANY (ncv).any_ptr = (void *)coro;
2266
2267 xcv = GvCV (gv_fetchpv ("Coro::_generator_call", 0, SVt_PVCV));
2268
2269 CvXSUB (ncv) = CvXSUB (xcv);
2270 CvANON_on (ncv);
2271
2272 mg = sv_magicext ((SV *)ncv, 0, CORO_MAGIC_type_state, &coro_gensub_vtbl, (char *)coro, 0);
2273 RETVAL = newRV_noinc ((SV *)ncv);
2274}
2275 OUTPUT:
2276 RETVAL
2277
2278#endif
2279
1761 2280
1762MODULE = Coro::State PACKAGE = Coro::AIO 2281MODULE = Coro::State PACKAGE = Coro::AIO
1763 2282
1764SV * 2283void
1765_get_state () 2284_get_state (SV *self)
1766 CODE: 2285 PPCODE:
1767{ 2286{
1768 struct io_state *data; 2287 AV *defav = GvAV (PL_defgv);
1769 2288 AV *av = newAV ();
2289 int i;
1770 RETVAL = newSV (sizeof (struct io_state)); 2290 SV *data_sv = newSV (sizeof (struct io_state));
1771 data = (struct io_state *)SvPVX (RETVAL); 2291 struct io_state *data = (struct io_state *)SvPVX (data_sv);
1772 SvCUR_set (RETVAL, sizeof (struct io_state)); 2292 SvCUR_set (data_sv, sizeof (struct io_state));
1773 SvPOK_only (RETVAL); 2293 SvPOK_only (data_sv);
1774 2294
1775 data->errorno = errno; 2295 data->errorno = errno;
1776 data->laststype = PL_laststype; 2296 data->laststype = PL_laststype;
1777 data->laststatval = PL_laststatval; 2297 data->laststatval = PL_laststatval;
1778 data->statcache = PL_statcache; 2298 data->statcache = PL_statcache;
2299
2300 av_extend (av, AvFILLp (defav) + 1 + 1);
2301
2302 for (i = 0; i <= AvFILLp (defav); ++i)
2303 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i]));
2304
2305 av_push (av, data_sv);
2306
2307 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2308
2309 api_ready (self);
1779} 2310}
1780 OUTPUT:
1781 RETVAL
1782 2311
1783void 2312void
1784_set_state (char *data_) 2313_set_state (SV *state)
1785 PROTOTYPE: $ 2314 PROTOTYPE: $
1786 CODE: 2315 PPCODE:
1787{ 2316{
1788 struct io_state *data = (void *)data_; 2317 AV *av = (AV *)SvRV (state);
2318 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]);
2319 int i;
1789 2320
1790 errno = data->errorno; 2321 errno = data->errorno;
1791 PL_laststype = data->laststype; 2322 PL_laststype = data->laststype;
1792 PL_laststatval = data->laststatval; 2323 PL_laststatval = data->laststatval;
1793 PL_statcache = data->statcache; 2324 PL_statcache = data->statcache;
1794}
1795 2325
2326 EXTEND (SP, AvFILLp (av));
2327 for (i = 0; i < AvFILLp (av); ++i)
2328 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2329}
2330
2331
2332MODULE = Coro::State PACKAGE = Coro::AnyEvent
2333
2334BOOT:
2335 sv_activity = coro_get_sv (aTHX_ "Coro::AnyEvent::ACTIVITY", TRUE);
2336
2337SV *
2338_schedule (...)
2339 PROTOTYPE: @
2340 CODE:
2341{
2342 static int incede;
2343
2344 api_cede_notself ();
2345
2346 ++incede;
2347 while (coro_nready >= incede && api_cede ())
2348 ;
2349
2350 sv_setsv (sv_activity, &PL_sv_undef);
2351 if (coro_nready >= incede)
2352 {
2353 PUSHMARK (SP);
2354 PUTBACK;
2355 call_pv ("Coro::AnyEvent::_activity", G_DISCARD | G_EVAL);
2356 SPAGAIN;
2357 }
2358
2359 --incede;
2360}
2361
2362
2363MODULE = Coro::State PACKAGE = PerlIO::cede
2364
2365BOOT:
2366 PerlIO_define_layer (aTHX_ &PerlIO_cede);

Diff Legend

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