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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines