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

Diff Legend

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