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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines