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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines