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

Diff Legend

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