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.182 by root, Wed Oct 3 18:37:48 2007 UTC vs.
Revision 1.264 by root, Fri Nov 14 02:29:09 2008 UTC

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

Diff Legend

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