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

Diff Legend

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