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

Diff Legend

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