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.122 by root, Mon Dec 4 13:47:56 2006 UTC vs.
Revision 1.146 by root, Sat Mar 17 19:51:57 2007 UTC

1#include "libcoro/coro.c" 1#include "libcoro/coro.c"
2
3#define PERL_NO_GET_CONTEXT
2 4
3#include "EXTERN.h" 5#include "EXTERN.h"
4#include "perl.h" 6#include "perl.h"
5#include "XSUB.h" 7#include "XSUB.h"
6 8
7#include "patchlevel.h" 9#include "patchlevel.h"
8 10
9#if USE_VALGRIND
10# include <valgrind/valgrind.h>
11#endif
12
13/* the maximum number of idle cctx that will be pooled */
14#define MAX_IDLE_CCTX 8
15
16#define PERL_VERSION_ATLEAST(a,b,c) \
17 (PERL_REVISION > (a) \
18 || (PERL_REVISION == (a) \
19 && (PERL_VERSION > (b) \
20 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c)))))
21
22#if !PERL_VERSION_ATLEAST (5,6,0)
23# ifndef PL_ppaddr
24# define PL_ppaddr ppaddr
25# endif
26# ifndef call_sv
27# define call_sv perl_call_sv
28# endif
29# ifndef get_sv
30# define get_sv perl_get_sv
31# endif
32# ifndef get_cv
33# define get_cv perl_get_cv
34# endif
35# ifndef IS_PADGV
36# define IS_PADGV(v) 0
37# endif
38# ifndef IS_PADCONST
39# define IS_PADCONST(v) 0
40# endif
41#endif
42
43#include <stdio.h> 11#include <stdio.h>
44#include <errno.h> 12#include <errno.h>
45 13#include <assert.h>
46#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
47# undef STACKGUARD
48#endif
49
50#ifndef STACKGUARD
51# define STACKGUARD 0
52#endif
53 14
54#ifdef HAVE_MMAP 15#ifdef HAVE_MMAP
55# include <unistd.h> 16# include <unistd.h>
56# include <sys/mman.h> 17# include <sys/mman.h>
57# ifndef MAP_ANONYMOUS 18# ifndef MAP_ANONYMOUS
72#else 33#else
73# define PAGESIZE 0 34# define PAGESIZE 0
74# define BOOT_PAGESIZE (void)0 35# define BOOT_PAGESIZE (void)0
75#endif 36#endif
76 37
38#if CORO_USE_VALGRIND
39# 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
44
45/* the maximum number of idle cctx that will be pooled */
46#define MAX_IDLE_CCTX 8
47
48#define PERL_VERSION_ATLEAST(a,b,c) \
49 (PERL_REVISION > (a) \
50 || (PERL_REVISION == (a) \
51 && (PERL_VERSION > (b) \
52 || (PERL_VERSION == (b) && PERLSUBVERSION >= (c)))))
53
54#if !PERL_VERSION_ATLEAST (5,6,0)
55# ifndef PL_ppaddr
56# define PL_ppaddr ppaddr
57# endif
58# ifndef call_sv
59# define call_sv perl_call_sv
60# endif
61# ifndef get_sv
62# define get_sv perl_get_sv
63# endif
64# ifndef get_cv
65# define get_cv perl_get_cv
66# endif
67# ifndef IS_PADGV
68# define IS_PADGV(v) 0
69# endif
70# ifndef IS_PADCONST
71# define IS_PADCONST(v) 0
72# endif
73#endif
74
75/* 5.8.7 */
76#ifndef SvRV_set
77# define SvRV_set(s,v) SvRV(s) = (v)
78#endif
79
80#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
81# undef CORO_STACKGUARD
82#endif
83
84#ifndef CORO_STACKGUARD
85# define CORO_STACKGUARD 0
86#endif
87
88/* prefer perl internal functions over our own? */
89#ifndef CORO_PREFER_PERL_FUNCTIONS
90# define CORO_PREFER_PERL_FUNCTIONS 0
91#endif
92
77/* The next macro should declare a variable stacklevel that contains and approximation 93/* The next macro should declare a variable stacklevel that contains and approximation
78 * to the current C stack pointer. Its property is that it changes with each call 94 * to the current C stack pointer. Its property is that it changes with each call
79 * and should be unique. */ 95 * and should be unique. */
80#define dSTACKLEVEL int stacklevel 96#define dSTACKLEVEL int stacklevel
81#define STACKLEVEL ((void *)&stacklevel) 97#define STACKLEVEL ((void *)&stacklevel)
82 98
83#define IN_DESTRUCT (PL_main_cv == Nullcv) 99#define IN_DESTRUCT (PL_main_cv == Nullcv)
84 100
85#if __GNUC__ >= 3 101#if __GNUC__ >= 3
86# define attribute(x) __attribute__(x) 102# define attribute(x) __attribute__(x)
103# define BARRIER __asm__ __volatile__ ("" : : : "memory")
87#else 104#else
88# define attribute(x) 105# define attribute(x)
106# define BARRIER
89#endif 107#endif
90 108
91#define NOINLINE attribute ((noinline)) 109#define NOINLINE attribute ((noinline))
92 110
93#include "CoroAPI.h" 111#include "CoroAPI.h"
99#else 117#else
100# define LOCK (void)0 118# define LOCK (void)0
101# define UNLOCK (void)0 119# define UNLOCK (void)0
102#endif 120#endif
103 121
122/* helper storage struct for Coro::AIO */
104struct io_state 123struct io_state
105{ 124{
106 int errorno; 125 int errorno;
107 I32 laststype; 126 I32 laststype;
108 int laststatval; 127 int laststatval;
109 Stat_t statcache; 128 Stat_t statcache;
110}; 129};
111 130
131static size_t coro_stacksize = CORO_STACKSIZE;
112static struct CoroAPI coroapi; 132static struct CoroAPI coroapi;
113static AV *main_mainstack; /* used to differentiate between $main and others */ 133static AV *main_mainstack; /* used to differentiate between $main and others */
114static HV *coro_state_stash, *coro_stash; 134static HV *coro_state_stash, *coro_stash;
115static SV *coro_mortal; /* will be freed after next transfer */ 135static SV *coro_mortal; /* will be freed after next transfer */
116 136
121typedef struct coro_cctx { 141typedef struct coro_cctx {
122 struct coro_cctx *next; 142 struct coro_cctx *next;
123 143
124 /* the stack */ 144 /* the stack */
125 void *sptr; 145 void *sptr;
126 long ssize; /* positive == mmap, otherwise malloc */ 146 size_t ssize;
127 147
128 /* cpu state */ 148 /* cpu state */
129 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 149 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
150 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
130 JMPENV *top_env; 151 JMPENV *top_env;
131 coro_context cctx; 152 coro_context cctx;
132 153
133 int inuse;
134
135#if USE_VALGRIND 154#if CORO_USE_VALGRIND
136 int valgrind_id; 155 int valgrind_id;
137#endif 156#endif
157 char inuse, mapped;
138} coro_cctx; 158} coro_cctx;
139 159
140enum { 160enum {
141 CF_RUNNING = 0x0001, /* coroutine is running */ 161 CF_RUNNING = 0x0001, /* coroutine is running */
142 CF_READY = 0x0002, /* coroutine is ready */ 162 CF_READY = 0x0002, /* coroutine is ready */
143 CF_NEW = 0x0004, /* ahs never been switched to */ 163 CF_NEW = 0x0004, /* has never been switched to */
164 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
144}; 165};
145 166
146/* this is a structure representing a perl-level coroutine */ 167/* this is a structure representing a perl-level coroutine */
147struct coro { 168struct coro {
148 /* the c coroutine allocated to this perl coroutine, if any */ 169 /* the c coroutine allocated to this perl coroutine, if any */
157 /* optionally saved, might be zero */ 178 /* optionally saved, might be zero */
158 AV *defav; /* @_ */ 179 AV *defav; /* @_ */
159 SV *defsv; /* $_ */ 180 SV *defsv; /* $_ */
160 SV *errsv; /* $@ */ 181 SV *errsv; /* $@ */
161 SV *irssv; /* $/ */ 182 SV *irssv; /* $/ */
183 SV *irssv_sv; /* real $/ cache */
162 184
163#define VAR(name,type) type name; 185#define VAR(name,type) type name;
164# include "state.h" 186# include "state.h"
165#undef VAR 187#undef VAR
166 188
169}; 191};
170 192
171typedef struct coro *Coro__State; 193typedef struct coro *Coro__State;
172typedef struct coro *Coro__State_or_hashref; 194typedef struct coro *Coro__State_or_hashref;
173 195
196/** Coro ********************************************************************/
197
198#define PRIO_MAX 3
199#define PRIO_HIGH 1
200#define PRIO_NORMAL 0
201#define PRIO_LOW -1
202#define PRIO_IDLE -3
203#define PRIO_MIN -4
204
205/* for Coro.pm */
206static SV *coro_current;
207static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
208static int coro_nready;
209
210/** lowlevel stuff **********************************************************/
211
174static AV * 212static AV *
175coro_clone_padlist (CV *cv) 213coro_clone_padlist (pTHX_ CV *cv)
176{ 214{
177 AV *padlist = CvPADLIST (cv); 215 AV *padlist = CvPADLIST (cv);
178 AV *newpadlist, *newpad; 216 AV *newpadlist, *newpad;
179 217
180 newpadlist = newAV (); 218 newpadlist = newAV ();
192 230
193 return newpadlist; 231 return newpadlist;
194} 232}
195 233
196static void 234static void
197free_padlist (AV *padlist) 235free_padlist (pTHX_ AV *padlist)
198{ 236{
199 /* may be during global destruction */ 237 /* may be during global destruction */
200 if (SvREFCNT (padlist)) 238 if (SvREFCNT (padlist))
201 { 239 {
202 I32 i = AvFILLp (padlist); 240 I32 i = AvFILLp (padlist);
223 AV *padlist; 261 AV *padlist;
224 AV *av = (AV *)mg->mg_obj; 262 AV *av = (AV *)mg->mg_obj;
225 263
226 /* casting is fun. */ 264 /* casting is fun. */
227 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 265 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
228 free_padlist (padlist); 266 free_padlist (aTHX_ padlist);
229 267
230 SvREFCNT_dec (av); 268 SvREFCNT_dec (av);
231 269
232 return 0; 270 return 0;
233} 271}
243 : mg_find ((SV *)cv, PERL_MAGIC_coro) \ 281 : mg_find ((SV *)cv, PERL_MAGIC_coro) \
244 : 0 282 : 0
245 283
246/* the next two functions merely cache the padlists */ 284/* the next two functions merely cache the padlists */
247static void 285static void
248get_padlist (CV *cv) 286get_padlist (pTHX_ CV *cv)
249{ 287{
250 MAGIC *mg = CORO_MAGIC (cv); 288 MAGIC *mg = CORO_MAGIC (cv);
251 AV *av; 289 AV *av;
252 290
253 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 291 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)
254 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 292 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
255 else 293 else
256 { 294 {
257#if 0 295#if CORO_PREFER_PERL_FUNCTIONS
258 /* this is probably cleaner, but also slower? */ 296 /* this is probably cleaner, but also slower? */
259 CV *cp = Perl_cv_clone (cv); 297 CV *cp = Perl_cv_clone (cv);
260 CvPADLIST (cv) = CvPADLIST (cp); 298 CvPADLIST (cv) = CvPADLIST (cp);
261 CvPADLIST (cp) = 0; 299 CvPADLIST (cp) = 0;
262 SvREFCNT_dec (cp); 300 SvREFCNT_dec (cp);
263#else 301#else
264 CvPADLIST (cv) = coro_clone_padlist (cv); 302 CvPADLIST (cv) = coro_clone_padlist (aTHX_ cv);
265#endif 303#endif
266 } 304 }
267} 305}
268 306
269static void 307static void
270put_padlist (CV *cv) 308put_padlist (pTHX_ CV *cv)
271{ 309{
272 MAGIC *mg = CORO_MAGIC (cv); 310 MAGIC *mg = CORO_MAGIC (cv);
273 AV *av; 311 AV *av;
274 312
275 if (!mg) 313 if (!mg)
286 av_extend (av, AvMAX (av) + 1); 324 av_extend (av, AvMAX (av) + 1);
287 325
288 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 326 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
289} 327}
290 328
329/** load & save, init *******************************************************/
330
291#define SB do { 331#define SB do {
292#define SE } while (0) 332#define SE } while (0)
293 333
294#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE 334#define REPLACE_SV(sv,val) SB SvREFCNT_dec (sv); (sv) = (val); (val) = 0; SE
295 335
296static void 336static void
297load_perl (Coro__State c) 337load_perl (pTHX_ Coro__State c)
298{ 338{
299#define VAR(name,type) PL_ ## name = c->name; 339#define VAR(name,type) PL_ ## name = c->name;
300# include "state.h" 340# include "state.h"
301#undef VAR 341#undef VAR
302 342
303 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 343 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
304 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 344 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
305 if (c->errsv) REPLACE_SV (ERRSV , c->errsv); 345 if (c->errsv) REPLACE_SV (ERRSV , c->errsv);
306 if (c->irssv) REPLACE_SV (PL_rs , c->irssv); 346 if (c->irssv)
347 {
348 if (c->irssv == PL_rs || sv_eq (PL_rs, c->irssv))
349 SvREFCNT_dec (c->irssv);
350 else
351 {
352 REPLACE_SV (PL_rs, c->irssv);
353 if (!c->irssv_sv) c->irssv_sv = get_sv ("/", 0);
354 sv_setsv (c->irssv_sv, PL_rs);
355 }
356 }
307 357
308 { 358 {
309 dSP; 359 dSP;
310 CV *cv; 360 CV *cv;
311 361
312 /* now do the ugly restore mess */ 362 /* now do the ugly restore mess */
313 while ((cv = (CV *)POPs)) 363 while ((cv = (CV *)POPs))
314 { 364 {
315 put_padlist (cv); /* mark this padlist as available */ 365 put_padlist (aTHX_ cv); /* mark this padlist as available */
316 CvDEPTH (cv) = PTR2IV (POPs); 366 CvDEPTH (cv) = PTR2IV (POPs);
317 CvPADLIST (cv) = (AV *)POPs; 367 CvPADLIST (cv) = (AV *)POPs;
318 } 368 }
319 369
320 PUTBACK; 370 PUTBACK;
321 } 371 }
372 assert (!PL_comppad || AvARRAY (PL_comppad));//D
322} 373}
323 374
324static void 375static void
325save_perl (Coro__State c) 376save_perl (pTHX_ Coro__State c)
326{ 377{
378 assert (!PL_comppad || AvARRAY (PL_comppad));//D
327 { 379 {
328 dSP; 380 dSP;
329 I32 cxix = cxstack_ix; 381 I32 cxix = cxstack_ix;
330 PERL_CONTEXT *ccstk = cxstack; 382 PERL_CONTEXT *ccstk = cxstack;
331 PERL_SI *top_si = PL_curstackinfo; 383 PERL_SI *top_si = PL_curstackinfo;
333 /* 385 /*
334 * the worst thing you can imagine happens first - we have to save 386 * the worst thing you can imagine happens first - we have to save
335 * (and reinitialize) all cv's in the whole callchain :( 387 * (and reinitialize) all cv's in the whole callchain :(
336 */ 388 */
337 389
390 EXTEND (SP, 3 + 1);
338 PUSHs (Nullsv); 391 PUSHs (Nullsv);
339 /* this loop was inspired by pp_caller */ 392 /* this loop was inspired by pp_caller */
340 for (;;) 393 for (;;)
341 { 394 {
342 while (cxix >= 0) 395 while (cxix >= 0)
348 CV *cv = cx->blk_sub.cv; 401 CV *cv = cx->blk_sub.cv;
349 402
350 if (CvDEPTH (cv)) 403 if (CvDEPTH (cv))
351 { 404 {
352 EXTEND (SP, 3); 405 EXTEND (SP, 3);
353
354 PUSHs ((SV *)CvPADLIST (cv)); 406 PUSHs ((SV *)CvPADLIST (cv));
355 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 407 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
356 PUSHs ((SV *)cv); 408 PUSHs ((SV *)cv);
357 409
358 CvDEPTH (cv) = 0; 410 CvDEPTH (cv) = 0;
359 get_padlist (cv); 411 get_padlist (aTHX_ cv);
360 } 412 }
361 } 413 }
362#ifdef CXt_FORMAT
363 else if (CxTYPE (cx) == CXt_FORMAT)
364 {
365 /* I never used formats, so how should I know how these are implemented? */
366 /* my bold guess is as a simple, plain sub... */
367 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
368 }
369#endif
370 } 414 }
371 415
372 if (top_si->si_type == PERLSI_MAIN) 416 if (top_si->si_type == PERLSI_MAIN)
373 break; 417 break;
374 418
394 * allocate various perl stacks. This is an exact copy 438 * allocate various perl stacks. This is an exact copy
395 * of perl.c:init_stacks, except that it uses less memory 439 * of perl.c:init_stacks, except that it uses less memory
396 * on the (sometimes correct) assumption that coroutines do 440 * on the (sometimes correct) assumption that coroutines do
397 * not usually need a lot of stackspace. 441 * not usually need a lot of stackspace.
398 */ 442 */
443#if CORO_PREFER_PERL_FUNCTIONS
444# define coro_init_stacks init_stacks
445#else
399static void 446static void
400coro_init_stacks () 447coro_init_stacks (pTHX)
401{ 448{
402 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT)); 449 PL_curstackinfo = new_stackinfo(128, 1024/sizeof(PERL_CONTEXT));
403 PL_curstackinfo->si_type = PERLSI_MAIN; 450 PL_curstackinfo->si_type = PERLSI_MAIN;
404 PL_curstack = PL_curstackinfo->si_stack; 451 PL_curstack = PL_curstackinfo->si_stack;
405 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 452 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
433 New(54,PL_retstack,16,OP*); 480 New(54,PL_retstack,16,OP*);
434 PL_retstack_ix = 0; 481 PL_retstack_ix = 0;
435 PL_retstack_max = 16; 482 PL_retstack_max = 16;
436#endif 483#endif
437} 484}
485#endif
438 486
439/* 487/*
440 * destroy the stacks, the callchain etc... 488 * destroy the stacks, the callchain etc...
441 */ 489 */
442static void 490static void
443coro_destroy_stacks () 491coro_destroy_stacks (pTHX)
444{ 492{
445 if (!IN_DESTRUCT) 493 if (!IN_DESTRUCT)
446 { 494 {
447 /* is this ugly, I ask? */ 495 /* restore all saved variables and stuff */
448 LEAVE_SCOPE (0); 496 LEAVE_SCOPE (0);
497 assert (PL_tmps_floor == -1);
449 498
450 /* sure it is, but more important: is it correct?? :/ */ 499 /* free all temporaries */
451 FREETMPS; 500 FREETMPS;
501 assert (PL_tmps_ix == -1);
452 502
503 /* unwind all extra stacks */
453 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/ 504 POPSTACK_TO (PL_mainstack);
505
506 /* unwind main stack */
507 dounwind (-1);
454 } 508 }
455 509
456 while (PL_curstackinfo->si_next) 510 while (PL_curstackinfo->si_next)
457 PL_curstackinfo = PL_curstackinfo->si_next; 511 PL_curstackinfo = PL_curstackinfo->si_next;
458 512
459 while (PL_curstackinfo) 513 while (PL_curstackinfo)
460 { 514 {
461 PERL_SI *p = PL_curstackinfo->si_prev; 515 PERL_SI *p = PL_curstackinfo->si_prev;
462 516
463 { /*D*//*remove*/
464 dSP;
465 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
466 PUTBACK; /* possibly superfluous */
467 }
468
469 if (!IN_DESTRUCT) 517 if (!IN_DESTRUCT)
470 {
471 dounwind (-1);/*D*//*remove*/
472 SvREFCNT_dec (PL_curstackinfo->si_stack); 518 SvREFCNT_dec (PL_curstackinfo->si_stack);
473 }
474 519
475 Safefree (PL_curstackinfo->si_cxstack); 520 Safefree (PL_curstackinfo->si_cxstack);
476 Safefree (PL_curstackinfo); 521 Safefree (PL_curstackinfo);
477 PL_curstackinfo = p; 522 PL_curstackinfo = p;
478 } 523 }
484#if !PERL_VERSION_ATLEAST (5,9,0) 529#if !PERL_VERSION_ATLEAST (5,9,0)
485 Safefree (PL_retstack); 530 Safefree (PL_retstack);
486#endif 531#endif
487} 532}
488 533
534/** coroutine stack handling ************************************************/
535
489static void 536static void
490setup_coro (struct coro *coro) 537setup_coro (pTHX_ struct coro *coro)
491{ 538{
492 /* 539 /*
493 * emulate part of the perl startup here. 540 * emulate part of the perl startup here.
494 */ 541 */
495
496 coro_init_stacks (); 542 coro_init_stacks (aTHX);
497 543
498 PL_curcop = &PL_compiling; 544 PL_curcop = &PL_compiling;
499 PL_in_eval = EVAL_NULL; 545 PL_in_eval = EVAL_NULL;
546 PL_comppad = 0;
500 PL_curpm = 0; 547 PL_curpm = 0;
501 PL_localizing = 0; 548 PL_localizing = 0;
502 PL_dirty = 0; 549 PL_dirty = 0;
503 PL_restartop = 0; 550 PL_restartop = 0;
504 551
523 570
524 ENTER; /* necessary e.g. for dounwind */ 571 ENTER; /* necessary e.g. for dounwind */
525} 572}
526 573
527static void 574static void
528free_coro_mortal () 575free_coro_mortal (pTHX)
529{ 576{
530 if (coro_mortal) 577 if (coro_mortal)
531 { 578 {
532 SvREFCNT_dec (coro_mortal); 579 SvREFCNT_dec (coro_mortal);
533 coro_mortal = 0; 580 coro_mortal = 0;
534 } 581 }
535} 582}
536 583
537/* inject a fake call to Coro::State::_cctx_init into the execution */ 584/* inject a fake call to Coro::State::_cctx_init into the execution */
538static void NOINLINE 585static void NOINLINE
539prepare_cctx (coro_cctx *cctx) 586prepare_cctx (pTHX_ coro_cctx *cctx)
540{ 587{
541 dSP; 588 dSP;
542 LOGOP myop; 589 LOGOP myop;
543 590
544 Zero (&myop, 1, LOGOP); 591 Zero (&myop, 1, LOGOP);
556} 603}
557 604
558static void 605static void
559coro_run (void *arg) 606coro_run (void *arg)
560{ 607{
608 dTHX;
609
561 /* coro_run is the alternative tail of transfer(), so unlock here. */ 610 /* coro_run is the alternative tail of transfer(), so unlock here. */
562 UNLOCK; 611 UNLOCK;
563 612
564 /* 613 /*
565 * this is a _very_ stripped down perl interpreter ;) 614 * this is a _very_ stripped down perl interpreter ;)
566 */ 615 */
567 PL_top_env = &PL_start_env; 616 PL_top_env = &PL_start_env;
568 617
569 /* inject call to cctx_init */ 618 /* inject call to cctx_init */
570 prepare_cctx ((coro_cctx *)arg); 619 prepare_cctx (aTHX_ (coro_cctx *)arg);
571 620
572 /* somebody will hit me for both perl_run and PL_restartop */ 621 /* somebody will hit me for both perl_run and PL_restartop */
573 PL_restartop = PL_op; 622 PL_restartop = PL_op;
574 perl_run (PL_curinterp); 623 perl_run (PL_curinterp);
575 624
579 628
580static coro_cctx * 629static coro_cctx *
581cctx_new () 630cctx_new ()
582{ 631{
583 coro_cctx *cctx; 632 coro_cctx *cctx;
633 void *stack_start;
634 size_t stack_size;
584 635
585 ++cctx_count; 636 ++cctx_count;
586 637
587 New (0, cctx, 1, coro_cctx); 638 Newz (0, cctx, 1, coro_cctx);
588 639
589#if HAVE_MMAP 640#if HAVE_MMAP
590 641
591 cctx->ssize = ((STACKSIZE * sizeof (long) + PAGESIZE - 1) / PAGESIZE + STACKGUARD) * PAGESIZE; 642 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
592 /* mmap supposedly does allocate-on-write for us */ 643 /* mmap supposedly does allocate-on-write for us */
593 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 644 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
594 645
595 if (cctx->sptr == (void *)-1) 646 if (cctx->sptr != (void *)-1)
596 {
597 perror ("FATAL: unable to mmap stack for coroutine");
598 _exit (EXIT_FAILURE);
599 } 647 {
600
601# if STACKGUARD 648# if CORO_STACKGUARD
602 mprotect (cctx->sptr, STACKGUARD * PAGESIZE, PROT_NONE); 649 mprotect (cctx->sptr, CORO_STACKGUARD * PAGESIZE, PROT_NONE);
603# endif 650# endif
651 stack_start = CORO_STACKGUARD * PAGESIZE + (char *)cctx->sptr;
652 stack_size = cctx->ssize - CORO_STACKGUARD * PAGESIZE;
653 cctx->mapped = 1;
654 }
655 else
656#endif
657 {
658 cctx->ssize = coro_stacksize * (long)sizeof (long);
659 New (0, cctx->sptr, coro_stacksize, long);
604 660
605#else
606
607 cctx->ssize = STACKSIZE * (long)sizeof (long);
608 New (0, cctx->sptr, STACKSIZE, long);
609
610 if (!cctx->sptr) 661 if (!cctx->sptr)
611 { 662 {
612 perror ("FATAL: unable to malloc stack for coroutine"); 663 perror ("FATAL: unable to allocate stack for coroutine");
613 _exit (EXIT_FAILURE); 664 _exit (EXIT_FAILURE);
614 } 665 }
615 666
616#endif 667 stack_start = cctx->sptr;
668 stack_size = cctx->ssize;
669 }
617 670
618#if USE_VALGRIND 671 REGISTER_STACK (cctx, (char *)stack_start, (char *)stack_start + stack_size);
619 cctx->valgrind_id = VALGRIND_STACK_REGISTER (
620 STACKGUARD * PAGESIZE + (char *)cctx->sptr,
621 cctx->ssize + (char *)cctx->sptr
622 );
623#endif
624
625 coro_create (&cctx->cctx, coro_run, (void *)cctx, cctx->sptr, cctx->ssize); 672 coro_create (&cctx->cctx, coro_run, (void *)cctx, stack_start, stack_size);
626 673
627 return cctx; 674 return cctx;
628} 675}
629 676
630static void 677static void
633 if (!cctx) 680 if (!cctx)
634 return; 681 return;
635 682
636 --cctx_count; 683 --cctx_count;
637 684
638#if USE_VALGRIND 685#if CORO_USE_VALGRIND
639 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 686 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
640#endif 687#endif
641 688
642#if HAVE_MMAP 689#if HAVE_MMAP
690 if (cctx->mapped)
643 munmap (cctx->sptr, cctx->ssize); 691 munmap (cctx->sptr, cctx->ssize);
644#else 692 else
693#endif
645 Safefree (cctx->sptr); 694 Safefree (cctx->sptr);
646#endif
647 695
648 Safefree (cctx); 696 Safefree (cctx);
649} 697}
650 698
651static coro_cctx * 699static coro_cctx *
652cctx_get () 700cctx_get (pTHX)
653{ 701{
654 coro_cctx *cctx;
655
656 if (cctx_first) 702 while (cctx_first)
657 { 703 {
658 cctx = cctx_first; 704 coro_cctx *cctx = cctx_first;
659 cctx_first = cctx->next; 705 cctx_first = cctx->next;
660 --cctx_idle; 706 --cctx_idle;
707
708 if (cctx->ssize >= coro_stacksize)
709 return cctx;
710
711 cctx_destroy (cctx);
661 } 712 }
662 else 713
663 {
664 cctx = cctx_new ();
665 PL_op = PL_op->op_next; 714 PL_op = PL_op->op_next;
666 }
667
668 return cctx; 715 return cctx_new ();
669} 716}
670 717
671static void 718static void
672cctx_put (coro_cctx *cctx) 719cctx_put (coro_cctx *cctx)
673{ 720{
685 ++cctx_idle; 732 ++cctx_idle;
686 cctx->next = cctx_first; 733 cctx->next = cctx_first;
687 cctx_first = cctx; 734 cctx_first = cctx;
688} 735}
689 736
737/** coroutine switching *****************************************************/
738
690/* never call directly, always through the coro_state_transfer global variable */ 739/* never call directly, always through the coro_state_transfer global variable */
691static void NOINLINE 740static void NOINLINE
692transfer (struct coro *prev, struct coro *next) 741transfer (pTHX_ struct coro *prev, struct coro *next)
693{ 742{
694 dSTACKLEVEL; 743 dSTACKLEVEL;
695 744
696 /* sometimes transfer is only called to set idle_sp */ 745 /* sometimes transfer is only called to set idle_sp */
697 if (!next) 746 if (!next)
747 {
698 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 748 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
749 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
750 }
699 else if (prev != next) 751 else if (prev != next)
700 { 752 {
701 coro_cctx *prev__cctx; 753 coro_cctx *prev__cctx;
702 754
703 if (prev->flags & CF_NEW) 755 if (prev->flags & CF_NEW)
714 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states"); 766 croak ("Coro::State::transfer called with non-running prev Coro::State, but can only transfer from running states");
715 767
716 if (next->flags & CF_RUNNING) 768 if (next->flags & CF_RUNNING)
717 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 769 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
718 770
771 if (next->flags & CF_DESTROYED)
772 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
773
719 prev->flags &= ~CF_RUNNING; 774 prev->flags &= ~CF_RUNNING;
720 next->flags |= CF_RUNNING; 775 next->flags |= CF_RUNNING;
721 776
722 LOCK; 777 LOCK;
723 778
724 if (next->flags & CF_NEW) 779 if (next->flags & CF_NEW)
725 { 780 {
726 /* need to start coroutine */ 781 /* need to start coroutine */
727 next->flags &= ~CF_NEW; 782 next->flags &= ~CF_NEW;
728 /* first get rid of the old state */ 783 /* first get rid of the old state */
729 save_perl (prev); 784 save_perl (aTHX_ prev);
730 /* setup coroutine call */ 785 /* setup coroutine call */
731 setup_coro (next); 786 setup_coro (aTHX_ next);
732 /* need a new stack */ 787 /* need a new stack */
733 assert (!next->stack); 788 assert (!next->cctx);
734 } 789 }
735 else 790 else
736 { 791 {
737 /* coroutine already started */ 792 /* coroutine already started */
738 save_perl (prev); 793 save_perl (aTHX_ prev);
739 load_perl (next); 794 load_perl (aTHX_ next);
740 } 795 }
741 796
742 prev__cctx = prev->cctx; 797 prev__cctx = prev->cctx;
743 798
744 /* possibly "free" the cctx */ 799 /* possibly "free" the cctx */
745 if (prev__cctx->idle_sp == STACKLEVEL) 800 if (prev__cctx->idle_sp == STACKLEVEL)
746 { 801 {
747 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 802 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
748 assert (PL_top_env == prev__cctx->top_env); 803 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
749 804
750 prev->cctx = 0; 805 prev->cctx = 0;
751 806
752 cctx_put (prev__cctx); 807 cctx_put (prev__cctx);
753 prev__cctx->inuse = 0; 808 prev__cctx->inuse = 0;
754 } 809 }
755 810
756 if (!next->cctx) 811 if (!next->cctx)
757 { 812 {
758 next->cctx = cctx_get (); 813 next->cctx = cctx_get (aTHX);
759 assert (!next->cctx->inuse); 814 assert (!next->cctx->inuse);
760 next->cctx->inuse = 1; 815 next->cctx->inuse = 1;
761 } 816 }
762 817
763 if (prev__cctx != next->cctx) 818 if (prev__cctx != next->cctx)
765 prev__cctx->top_env = PL_top_env; 820 prev__cctx->top_env = PL_top_env;
766 PL_top_env = next->cctx->top_env; 821 PL_top_env = next->cctx->top_env;
767 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 822 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
768 } 823 }
769 824
770 free_coro_mortal (); 825 free_coro_mortal (aTHX);
771
772 UNLOCK; 826 UNLOCK;
773 } 827 }
774} 828}
775 829
776struct transfer_args 830struct transfer_args
777{ 831{
778 struct coro *prev, *next; 832 struct coro *prev, *next;
779}; 833};
780 834
781#define TRANSFER(ta) transfer ((ta).prev, (ta).next) 835#define TRANSFER(ta) transfer (aTHX_ (ta).prev, (ta).next)
782 836
837/** high level stuff ********************************************************/
838
783static void 839static int
784coro_state_destroy (struct coro *coro) 840coro_state_destroy (pTHX_ struct coro *coro)
785{ 841{
786 if (coro->refcnt--) 842 if (coro->flags & CF_DESTROYED)
787 return; 843 return 0;
844
845 coro->flags |= CF_DESTROYED;
846
847 if (coro->flags & CF_READY)
848 {
849 /* reduce nready, as destroying a ready coro effectively unreadies it */
850 /* alternative: look through all ready queues and remove the coro */
851 LOCK;
852 --coro_nready;
853 UNLOCK;
854 }
855 else
856 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
788 857
789 if (coro->mainstack && coro->mainstack != main_mainstack) 858 if (coro->mainstack && coro->mainstack != main_mainstack)
790 { 859 {
791 struct coro temp; 860 struct coro temp;
861
862 assert (!(coro->flags & CF_RUNNING));
863
792 Zero (&temp, 1, struct coro); 864 Zero (&temp, 1, struct coro);
793 temp.save = CORO_SAVE_ALL; 865 temp.save = CORO_SAVE_ALL;
794 866
795 if (coro->flags & CF_RUNNING) 867 if (coro->flags & CF_RUNNING)
796 croak ("FATAL: tried to destroy currently running coroutine"); 868 croak ("FATAL: tried to destroy currently running coroutine");
797 869
798 save_perl (&temp); 870 save_perl (aTHX_ &temp);
799 load_perl (coro); 871 load_perl (aTHX_ coro);
800 872
801 coro_destroy_stacks (); 873 coro_destroy_stacks (aTHX);
802 874
803 load_perl (&temp); /* this will get rid of defsv etc.. */ 875 load_perl (aTHX_ &temp); /* this will get rid of defsv etc.. */
804 876
805 coro->mainstack = 0; 877 coro->mainstack = 0;
806 } 878 }
807 879
808 cctx_destroy (coro->cctx); 880 cctx_destroy (coro->cctx);
809 SvREFCNT_dec (coro->args); 881 SvREFCNT_dec (coro->args);
810 Safefree (coro); 882
883 return 1;
811} 884}
812 885
813static int 886static int
814coro_state_clear (pTHX_ SV *sv, MAGIC *mg) 887coro_state_free (pTHX_ SV *sv, MAGIC *mg)
815{ 888{
816 struct coro *coro = (struct coro *)mg->mg_ptr; 889 struct coro *coro = (struct coro *)mg->mg_ptr;
817 mg->mg_ptr = 0; 890 mg->mg_ptr = 0;
818 891
892 if (--coro->refcnt < 0)
893 {
819 coro_state_destroy (coro); 894 coro_state_destroy (aTHX_ coro);
895 Safefree (coro);
896 }
820 897
821 return 0; 898 return 0;
822} 899}
823 900
824static int 901static int
831 return 0; 908 return 0;
832} 909}
833 910
834static MGVTBL coro_state_vtbl = { 911static MGVTBL coro_state_vtbl = {
835 0, 0, 0, 0, 912 0, 0, 0, 0,
836 coro_state_clear, 913 coro_state_free,
837 0, 914 0,
838#ifdef MGf_DUP 915#ifdef MGf_DUP
839 coro_state_dup, 916 coro_state_dup,
840#else 917#else
841# define MGf_DUP 0 918# define MGf_DUP 0
842#endif 919#endif
843}; 920};
844 921
845static struct coro * 922static struct coro *
846SvSTATE (SV *coro) 923SvSTATE_ (pTHX_ SV *coro)
847{ 924{
848 HV *stash; 925 HV *stash;
849 MAGIC *mg; 926 MAGIC *mg;
850 927
851 if (SvROK (coro)) 928 if (SvROK (coro))
857 /* very slow, but rare, check */ 934 /* very slow, but rare, check */
858 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 935 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
859 croak ("Coro::State object required"); 936 croak ("Coro::State object required");
860 } 937 }
861 938
862 mg = SvMAGIC (coro); 939 mg = CORO_MAGIC (coro);
863 assert (mg->mg_type == PERL_MAGIC_ext);
864 return (struct coro *)mg->mg_ptr; 940 return (struct coro *)mg->mg_ptr;
865} 941}
866 942
943#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
944
867static void 945static void
868prepare_transfer (struct transfer_args *ta, SV *prev_sv, SV *next_sv) 946prepare_transfer (pTHX_ struct transfer_args *ta, SV *prev_sv, SV *next_sv)
869{ 947{
870 ta->prev = SvSTATE (prev_sv); 948 ta->prev = SvSTATE (prev_sv);
871 ta->next = SvSTATE (next_sv); 949 ta->next = SvSTATE (next_sv);
872} 950}
873 951
874static void 952static void
875api_transfer (SV *prev_sv, SV *next_sv) 953api_transfer (SV *prev_sv, SV *next_sv)
876{ 954{
955 dTHX;
877 struct transfer_args ta; 956 struct transfer_args ta;
878 957
879 prepare_transfer (&ta, prev_sv, next_sv); 958 prepare_transfer (aTHX_ &ta, prev_sv, next_sv);
880 TRANSFER (ta); 959 TRANSFER (ta);
881} 960}
882 961
883static int 962static int
884api_save (SV *coro_sv, int new_save) 963api_save (SV *coro_sv, int new_save)
885{ 964{
965 dTHX;
886 struct coro *coro = SvSTATE (coro_sv); 966 struct coro *coro = SvSTATE (coro_sv);
887 int old_save = coro->save; 967 int old_save = coro->save;
888 968
889 if (new_save >= 0) 969 if (new_save >= 0)
890 coro->save = new_save; 970 coro->save = new_save;
892 return old_save; 972 return old_save;
893} 973}
894 974
895/** Coro ********************************************************************/ 975/** Coro ********************************************************************/
896 976
897#define PRIO_MAX 3
898#define PRIO_HIGH 1
899#define PRIO_NORMAL 0
900#define PRIO_LOW -1
901#define PRIO_IDLE -3
902#define PRIO_MIN -4
903
904/* for Coro.pm */
905static SV *coro_current;
906static AV *coro_ready [PRIO_MAX-PRIO_MIN+1];
907static int coro_nready;
908
909static void 977static void
910coro_enq (SV *coro_sv) 978coro_enq (pTHX_ SV *coro_sv)
911{ 979{
912 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv); 980 av_push (coro_ready [SvSTATE (coro_sv)->prio - PRIO_MIN], coro_sv);
913 coro_nready++;
914} 981}
915 982
916static SV * 983static SV *
917coro_deq (int min_prio) 984coro_deq (pTHX_ int min_prio)
918{ 985{
919 int prio = PRIO_MAX - PRIO_MIN; 986 int prio = PRIO_MAX - PRIO_MIN;
920 987
921 min_prio -= PRIO_MIN; 988 min_prio -= PRIO_MIN;
922 if (min_prio < 0) 989 if (min_prio < 0)
923 min_prio = 0; 990 min_prio = 0;
924 991
925 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; ) 992 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= min_prio; )
926 if (AvFILLp (coro_ready [prio]) >= 0) 993 if (AvFILLp (coro_ready [prio]) >= 0)
927 {
928 coro_nready--;
929 return av_shift (coro_ready [prio]); 994 return av_shift (coro_ready [prio]);
930 }
931 995
932 return 0; 996 return 0;
933} 997}
934 998
935static int 999static int
936api_ready (SV *coro_sv) 1000api_ready (SV *coro_sv)
937{ 1001{
1002 dTHX;
938 struct coro *coro; 1003 struct coro *coro;
939 1004
940 if (SvROK (coro_sv)) 1005 if (SvROK (coro_sv))
941 coro_sv = SvRV (coro_sv); 1006 coro_sv = SvRV (coro_sv);
942 1007
943 coro = SvSTATE (coro_sv); 1008 coro = SvSTATE (coro_sv);
944 1009
945 if (coro->flags & CF_READY) 1010 if (coro->flags & CF_READY)
946 return 0; 1011 return 0;
947 1012
948#if 0 /* this is actually harmless */
949 if (coro->flags & CF_RUNNING)
950 croak ("Coro::ready called on currently running coroutine");
951#endif
952
953 coro->flags |= CF_READY; 1013 coro->flags |= CF_READY;
954 1014
955 LOCK; 1015 LOCK;
956 coro_enq (SvREFCNT_inc (coro_sv)); 1016 coro_enq (aTHX_ SvREFCNT_inc (coro_sv));
1017 ++coro_nready;
957 UNLOCK; 1018 UNLOCK;
958 1019
959 return 1; 1020 return 1;
960} 1021}
961 1022
962static int 1023static int
963api_is_ready (SV *coro_sv) 1024api_is_ready (SV *coro_sv)
964{ 1025{
1026 dTHX;
965 return !!SvSTATE (coro_sv)->flags & CF_READY; 1027 return !!(SvSTATE (coro_sv)->flags & CF_READY);
966} 1028}
967 1029
968static void 1030static void
969prepare_schedule (struct transfer_args *ta) 1031prepare_schedule (pTHX_ struct transfer_args *ta)
970{ 1032{
971 SV *prev, *next; 1033 SV *prev_sv, *next_sv;
972 1034
973 for (;;) 1035 for (;;)
974 { 1036 {
975 LOCK; 1037 LOCK;
976 next = coro_deq (PRIO_MIN); 1038 next_sv = coro_deq (aTHX_ PRIO_MIN);
1039
1040 /* nothing to schedule: call the idle handler */
1041 if (!next_sv)
1042 {
1043 dSP;
1044 UNLOCK;
1045
1046 ENTER;
1047 SAVETMPS;
1048
1049 PUSHMARK (SP);
1050 PUTBACK;
1051 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
1052
1053 FREETMPS;
1054 LEAVE;
1055 continue;
1056 }
1057
1058 ta->next = SvSTATE (next_sv);
1059
1060 /* cannot transfer to destroyed coros, skip and look for next */
1061 if (ta->next->flags & CF_DESTROYED)
1062 {
1063 UNLOCK;
1064 SvREFCNT_dec (next_sv);
1065 /* coro_nready is already taken care of by destroy */
1066 continue;
1067 }
1068
1069 --coro_nready;
977 UNLOCK; 1070 UNLOCK;
978
979 if (next)
980 break; 1071 break;
981
982 {
983 dSP;
984
985 ENTER;
986 SAVETMPS;
987
988 PUSHMARK (SP);
989 PUTBACK;
990 call_sv (get_sv ("Coro::idle", FALSE), G_DISCARD);
991
992 FREETMPS;
993 LEAVE;
994 } 1072 }
995 }
996
997 prev = SvRV (coro_current);
998 SvRV_set (coro_current, next);
999 1073
1000 /* free this only after the transfer */ 1074 /* free this only after the transfer */
1001 LOCK; 1075 prev_sv = SvRV (coro_current);
1002 free_coro_mortal (); 1076 SvRV_set (coro_current, next_sv);
1003 UNLOCK;
1004 coro_mortal = prev;
1005
1006 assert (!SvROK(prev));//D
1007 assert (!SvROK(next));//D
1008
1009 ta->prev = SvSTATE (prev); 1077 ta->prev = SvSTATE (prev_sv);
1010 ta->next = SvSTATE (next);
1011 1078
1012 assert (ta->next->flags & CF_READY); 1079 assert (ta->next->flags & CF_READY);
1013 ta->next->flags &= ~CF_READY; 1080 ta->next->flags &= ~CF_READY;
1014}
1015 1081
1082 LOCK;
1083 free_coro_mortal (aTHX);
1084 coro_mortal = prev_sv;
1085 UNLOCK;
1086}
1087
1016static void 1088static void
1017prepare_cede (struct transfer_args *ta) 1089prepare_cede (pTHX_ struct transfer_args *ta)
1018{ 1090{
1019 api_ready (coro_current); 1091 api_ready (coro_current);
1020
1021 prepare_schedule (ta); 1092 prepare_schedule (aTHX_ ta);
1093}
1094
1095static int
1096prepare_cede_notself (pTHX_ struct transfer_args *ta)
1097{
1098 if (coro_nready)
1099 {
1100 SV *prev = SvRV (coro_current);
1101 prepare_schedule (aTHX_ ta);
1102 api_ready (prev);
1103 return 1;
1104 }
1105 else
1106 return 0;
1022} 1107}
1023 1108
1024static void 1109static void
1025api_schedule (void) 1110api_schedule (void)
1026{ 1111{
1112 dTHX;
1027 struct transfer_args ta; 1113 struct transfer_args ta;
1028 1114
1029 prepare_schedule (&ta); 1115 prepare_schedule (aTHX_ &ta);
1030 TRANSFER (ta); 1116 TRANSFER (ta);
1031} 1117}
1032 1118
1033static void 1119static int
1034api_cede (void) 1120api_cede (void)
1035{ 1121{
1122 dTHX;
1036 struct transfer_args ta; 1123 struct transfer_args ta;
1037 1124
1038 prepare_cede (&ta); 1125 prepare_cede (aTHX_ &ta);
1126
1127 if (ta.prev != ta.next)
1128 {
1039 TRANSFER (ta); 1129 TRANSFER (ta);
1130 return 1;
1131 }
1132 else
1133 return 0;
1134}
1135
1136static int
1137api_cede_notself (void)
1138{
1139 dTHX;
1140 struct transfer_args ta;
1141
1142 if (prepare_cede_notself (aTHX_ &ta))
1143 {
1144 TRANSFER (ta);
1145 return 1;
1146 }
1147 else
1148 return 0;
1040} 1149}
1041 1150
1042MODULE = Coro::State PACKAGE = Coro::State 1151MODULE = Coro::State PACKAGE = Coro::State
1043 1152
1044PROTOTYPES: DISABLE 1153PROTOTYPES: DISABLE
1100_set_stacklevel (...) 1209_set_stacklevel (...)
1101 ALIAS: 1210 ALIAS:
1102 Coro::State::transfer = 1 1211 Coro::State::transfer = 1
1103 Coro::schedule = 2 1212 Coro::schedule = 2
1104 Coro::cede = 3 1213 Coro::cede = 3
1214 Coro::cede_notself = 4
1105 CODE: 1215 CODE:
1106{ 1216{
1107 struct transfer_args ta; 1217 struct transfer_args ta;
1108 1218
1109 switch (ix) 1219 switch (ix)
1115 1225
1116 case 1: 1226 case 1:
1117 if (items != 2) 1227 if (items != 2)
1118 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1228 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items);
1119 1229
1120 prepare_transfer (&ta, ST (0), ST (1)); 1230 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1121 break; 1231 break;
1122 1232
1123 case 2: 1233 case 2:
1124 prepare_schedule (&ta); 1234 prepare_schedule (aTHX_ &ta);
1125 break; 1235 break;
1126 1236
1127 case 3: 1237 case 3:
1128 prepare_cede (&ta); 1238 prepare_cede (aTHX_ &ta);
1239 break;
1240
1241 case 4:
1242 if (!prepare_cede_notself (aTHX_ &ta))
1243 XSRETURN_EMPTY;
1244
1129 break; 1245 break;
1130 } 1246 }
1131 1247
1248 BARRIER;
1132 TRANSFER (ta); 1249 TRANSFER (ta);
1133}
1134 1250
1135void 1251 if (GIMME_V != G_VOID && ta.next != ta.prev)
1136_clone_state_from (SV *dst, SV *src) 1252 XSRETURN_YES;
1253}
1254
1255bool
1256_destroy (SV *coro_sv)
1137 CODE: 1257 CODE:
1138{ 1258 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
1139 struct coro *coro_src = SvSTATE (src); 1259 OUTPUT:
1140 1260 RETVAL
1141 sv_unmagic (SvRV (dst), PERL_MAGIC_ext);
1142
1143 ++coro_src->refcnt;
1144 sv_magicext (SvRV (dst), 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro_src, 0)->mg_flags |= MGf_DUP;
1145}
1146 1261
1147void 1262void
1148_exit (code) 1263_exit (code)
1149 int code 1264 int code
1150 PROTOTYPE: $ 1265 PROTOTYPE: $
1151 CODE: 1266 CODE:
1152 _exit (code); 1267 _exit (code);
1153 1268
1154int 1269int
1270cctx_stacksize (int new_stacksize = 0)
1271 CODE:
1272 RETVAL = coro_stacksize;
1273 if (new_stacksize)
1274 coro_stacksize = new_stacksize;
1275 OUTPUT:
1276 RETVAL
1277
1278int
1155cctx_count () 1279cctx_count ()
1156 CODE: 1280 CODE:
1157 RETVAL = cctx_count; 1281 RETVAL = cctx_count;
1158 OUTPUT: 1282 OUTPUT:
1159 RETVAL 1283 RETVAL
1187 coro_ready[i] = newAV (); 1311 coro_ready[i] = newAV ();
1188 1312
1189 { 1313 {
1190 SV *sv = perl_get_sv("Coro::API", 1); 1314 SV *sv = perl_get_sv("Coro::API", 1);
1191 1315
1192 coroapi.schedule = api_schedule; 1316 coroapi.schedule = api_schedule;
1193 coroapi.save = api_save; 1317 coroapi.save = api_save;
1194 coroapi.cede = api_cede; 1318 coroapi.cede = api_cede;
1319 coroapi.cede_notself = api_cede_notself;
1195 coroapi.ready = api_ready; 1320 coroapi.ready = api_ready;
1196 coroapi.is_ready = api_is_ready; 1321 coroapi.is_ready = api_is_ready;
1197 coroapi.nready = &coro_nready; 1322 coroapi.nready = &coro_nready;
1198 coroapi.current = coro_current; 1323 coroapi.current = coro_current;
1199 1324
1200 GCoroAPI = &coroapi; 1325 GCoroAPI = &coroapi;
1201 sv_setiv (sv, (IV)&coroapi); 1326 sv_setiv (sv, (IV)&coroapi);
1202 SvREADONLY_on (sv); 1327 SvREADONLY_on (sv);
1203 } 1328 }
1219 RETVAL = coro->prio; 1344 RETVAL = coro->prio;
1220 1345
1221 if (items > 1) 1346 if (items > 1)
1222 { 1347 {
1223 if (ix) 1348 if (ix)
1224 newprio += coro->prio; 1349 newprio = coro->prio - newprio;
1225 1350
1226 if (newprio < PRIO_MIN) newprio = PRIO_MIN; 1351 if (newprio < PRIO_MIN) newprio = PRIO_MIN;
1227 if (newprio > PRIO_MAX) newprio = PRIO_MAX; 1352 if (newprio > PRIO_MAX) newprio = PRIO_MAX;
1228 1353
1229 coro->prio = newprio; 1354 coro->prio = newprio;
1230 } 1355 }
1231} 1356}
1357 OUTPUT:
1358 RETVAL
1232 1359
1233SV * 1360SV *
1234ready (SV *self) 1361ready (SV *self)
1235 PROTOTYPE: $ 1362 PROTOTYPE: $
1236 CODE: 1363 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines