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

Diff Legend

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