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.40 by root, Tue Nov 27 01:41:41 2001 UTC vs.
Revision 1.64 by root, Mon Mar 21 15:06:51 2005 UTC

1#define PERL_NO_GET_CONTEXT
2
3#include "libcoro/coro.c"
4
1#include "EXTERN.h" 5#include "EXTERN.h"
2#include "perl.h" 6#include "perl.h"
3#include "XSUB.h" 7#include "XSUB.h"
4 8
5#include "libcoro/coro.c" 9#include "patchlevel.h"
10
11#if PATCHLEVEL < 6
12# ifndef PL_ppaddr
13# define PL_ppaddr ppaddr
14# endif
15# ifndef call_sv
16# define call_sv perl_call_sv
17# endif
18# ifndef get_sv
19# define get_sv perl_get_sv
20# endif
21# ifndef get_cv
22# define get_cv perl_get_cv
23# endif
24# ifndef IS_PADGV
25# define IS_PADGV(v) 0
26# endif
27# ifndef IS_PADCONST
28# define IS_PADCONST(v) 0
29# endif
30#endif
6 31
7#include <signal.h> 32#include <signal.h>
8 33
9#ifdef HAVE_MMAP 34#ifdef HAVE_MMAP
10# include <unistd.h> 35# include <unistd.h>
16# undef HAVE_MMAP 41# undef HAVE_MMAP
17# endif 42# endif
18# endif 43# endif
19#endif 44#endif
20 45
21#define MAY_FLUSH /* increases codesize and is rarely used */
22
23#define SUB_INIT "Coro::State::initialize" 46#define SUB_INIT "Coro::State::initialize"
24#define UCORO_STATE "_coro_state" 47#define UCORO_STATE "_coro_state"
25 48
26/* The next macro should declare a variable stacklevel that contains and approximation 49/* The next macro should declare a variable stacklevel that contains and approximation
27 * to the current C stack pointer. Its property is that it changes with each call 50 * to the current C stack pointer. Its property is that it changes with each call
32 55
33#define labs(l) ((l) >= 0 ? (l) : -(l)) 56#define labs(l) ((l) >= 0 ? (l) : -(l))
34 57
35#include "CoroAPI.h" 58#include "CoroAPI.h"
36 59
60#ifdef USE_ITHREADS
61static perl_mutex coro_mutex;
62# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
63# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
64#else
65# define LOCK 0
66# define UNLOCK 0
67#endif
68
37static struct CoroAPI coroapi; 69static struct CoroAPI coroapi;
70static AV *main_mainstack; /* used to differentiate between $main and others */
71static HV *coro_state_stash;
72static SV *ucoro_state_sv;
73static U32 ucoro_state_hash;
74static SV *coro_mortal; /* will be freed after next transfer */
38 75
39/* this is actually not only the c stack but also c registers etc... */ 76/* this is actually not only the c stack but also c registers etc... */
40typedef struct { 77typedef struct {
41 int refcnt; /* pointer reference counter */ 78 int refcnt; /* pointer reference counter */
42 int usecnt; /* shared by how many coroutines */ 79 int usecnt; /* shared by how many coroutines */
47 void *sptr; 84 void *sptr;
48 long ssize; /* positive == mmap, otherwise malloc */ 85 long ssize; /* positive == mmap, otherwise malloc */
49} coro_stack; 86} coro_stack;
50 87
51struct coro { 88struct coro {
89 /* the top-level JMPENV for each coroutine, needed to catch dies. */
90 JMPENV start_env;
91
52 /* the optional C context */ 92 /* the optional C context */
53 coro_stack *stack; 93 coro_stack *stack;
54 void *cursp; 94 void *cursp;
55 int gencnt; 95 int gencnt;
56 96
68 AV *curstack; 108 AV *curstack;
69 AV *mainstack; 109 AV *mainstack;
70 SV **stack_sp; 110 SV **stack_sp;
71 OP *op; 111 OP *op;
72 SV **curpad; 112 SV **curpad;
113 AV *comppad;
114 CV *compcv;
73 SV **stack_base; 115 SV **stack_base;
74 SV **stack_max; 116 SV **stack_max;
75 SV **tmps_stack; 117 SV **tmps_stack;
76 I32 tmps_floor; 118 I32 tmps_floor;
77 I32 tmps_ix; 119 I32 tmps_ix;
87 I32 savestack_max; 129 I32 savestack_max;
88 OP **retstack; 130 OP **retstack;
89 I32 retstack_ix; 131 I32 retstack_ix;
90 I32 retstack_max; 132 I32 retstack_max;
91 COP *curcop; 133 COP *curcop;
92 PMOP *curpm;
93 JMPENV *top_env; 134 JMPENV *top_env;
94 135
95 /* data associated with this coroutine (initial args) */ 136 /* data associated with this coroutine (initial args) */
96 AV *args; 137 AV *args;
97}; 138};
98 139
99typedef struct coro *Coro__State; 140typedef struct coro *Coro__State;
100typedef struct coro *Coro__State_or_hashref; 141typedef struct coro *Coro__State_or_hashref;
101 142
102static AV *main_mainstack; /* used to differentiate between $main and others */
103static HV *coro_state_stash;
104static SV *ucoro_state_sv;
105static U32 ucoro_state_hash;
106static HV *padlist_cache;
107static SV *coro_mortal; /* will be freed after next transfer */
108
109/* mostly copied from op.c:cv_clone2 */ 143/* mostly copied from op.c:cv_clone2 */
110STATIC AV * 144STATIC AV *
111clone_padlist (AV *protopadlist) 145clone_padlist (pTHX_ AV *protopadlist)
112{ 146{
113 AV *av; 147 AV *av;
114 I32 ix; 148 I32 ix;
115 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE); 149 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE);
116 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE); 150 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE);
140 AvFLAGS (av) = AVf_REIFY; 174 AvFLAGS (av) = AVf_REIFY;
141 175
142 for (ix = fpad; ix > 0; ix--) 176 for (ix = fpad; ix > 0; ix--)
143 { 177 {
144 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv; 178 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv;
179
145 if (namesv && namesv != &PL_sv_undef) 180 if (namesv && namesv != &PL_sv_undef)
146 { 181 {
147 char *name = SvPVX (namesv); /* XXX */ 182 char *name = SvPVX (namesv); /* XXX */
183
148 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&') 184 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&')
149 { /* lexical from outside? */ 185 { /* lexical from outside? */
150 npad[ix] = SvREFCNT_inc (ppad[ix]); 186 npad[ix] = SvREFCNT_inc (ppad[ix]);
151 } 187 }
152 else 188 else
158 sv = (SV *) newAV (); 194 sv = (SV *) newAV ();
159 else if (*name == '%') 195 else if (*name == '%')
160 sv = (SV *) newHV (); 196 sv = (SV *) newHV ();
161 else 197 else
162 sv = NEWSV (0, 0); 198 sv = NEWSV (0, 0);
199
200#ifdef SvPADBUSY
163 if (!SvPADBUSY (sv)) 201 if (!SvPADBUSY (sv))
202#endif
164 SvPADMY_on (sv); 203 SvPADMY_on (sv);
204
165 npad[ix] = sv; 205 npad[ix] = sv;
166 } 206 }
167 } 207 }
168 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 208 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
169 { 209 {
198#endif 238#endif
199 239
200 return newpadlist; 240 return newpadlist;
201} 241}
202 242
203#ifdef MAY_FLUSH
204STATIC void 243STATIC void
205free_padlist (AV *padlist) 244free_padlist (pTHX_ AV *padlist)
206{ 245{
207 /* may be during global destruction */ 246 /* may be during global destruction */
208 if (SvREFCNT(padlist)) 247 if (SvREFCNT (padlist))
209 { 248 {
210 I32 i = AvFILLp(padlist); 249 I32 i = AvFILLp (padlist);
211 while (i >= 0) 250 while (i >= 0)
212 { 251 {
213 SV **svp = av_fetch(padlist, i--, FALSE); 252 SV **svp = av_fetch (padlist, i--, FALSE);
214 SV *sv = svp ? *svp : Nullsv;
215 if (sv) 253 if (svp)
254 {
255 SV *sv;
256 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
216 SvREFCNT_dec(sv); 257 SvREFCNT_dec (sv);
258
259 SvREFCNT_dec (*svp);
260 }
217 } 261 }
218 262
219 SvREFCNT_dec((SV*)padlist); 263 SvREFCNT_dec ((SV*)padlist);
220 } 264 }
221} 265}
222#endif 266
267STATIC int
268coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
269{
270 AV *padlist;
271 AV *av = (AV *)mg->mg_obj;
272
273 /* casting is fun. */
274 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
275 free_padlist (aTHX_ padlist);
276
277 SvREFCNT_dec (av);
278}
279
280#define PERL_MAGIC_coro PERL_MAGIC_ext
281
282static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
223 283
224/* the next two functions merely cache the padlists */ 284/* the next two functions merely cache the padlists */
225STATIC void 285STATIC void
226get_padlist (CV *cv) 286get_padlist (pTHX_ CV *cv)
227{ 287{
228 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 0); 288 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
229 289
230 if (he && AvFILLp ((AV *)*he) >= 0) 290 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
231 CvPADLIST (cv) = (AV *)av_pop ((AV *)*he); 291 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
232 else 292 else
233 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 293 CvPADLIST (cv) = clone_padlist (aTHX_ CvPADLIST (cv));
234} 294}
235 295
236STATIC void 296STATIC void
237put_padlist (CV *cv) 297put_padlist (pTHX_ CV *cv)
238{ 298{
239 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 1); 299 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
240 300
241 if (SvTYPE (*he) != SVt_PVAV) 301 if (!mg)
242 { 302 {
243 SvREFCNT_dec (*he); 303 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
304 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
305 mg->mg_virtual = &vtbl_coro;
244 *he = (SV *)newAV (); 306 mg->mg_obj = (SV *)newAV ();
245 } 307 }
246 308
247 av_push ((AV *)*he, (SV *)CvPADLIST (cv)); 309 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv));
248} 310}
249
250#ifdef MAY_FLUSH
251STATIC void
252flush_padlist_cache ()
253{
254 HV *hv = padlist_cache;
255 padlist_cache = newHV ();
256
257 if (hv_iterinit (hv))
258 {
259 HE *he;
260 AV *padlist;
261
262 while (!!(he = hv_iternext (hv)))
263 {
264 AV *av = (AV *)HeVAL(he);
265
266 /* casting is fun. */
267 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
268 free_padlist (padlist);
269 }
270 }
271
272 SvREFCNT_dec (hv);
273}
274#endif
275 311
276#define SB do { 312#define SB do {
277#define SE } while (0) 313#define SE } while (0)
278 314
279#define LOAD(state) load_state(aTHX_ (state)); 315#define LOAD(state) load_state(aTHX_ (state));
280#define SAVE(state,flags) save_state(aTHX_ (state),(flags)); 316#define SAVE(state,flags) save_state(aTHX_ (state),(flags));
281 317
282#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); SE 318#define REPLACE_SV(sv,val) SB SvREFCNT_dec(sv); (sv) = (val); (val) = 0; SE
283 319
284static void 320static void
285load_state(pTHX_ Coro__State c) 321load_state(pTHX_ Coro__State c)
286{ 322{
287 PL_dowarn = c->dowarn; 323 PL_dowarn = c->dowarn;
291 PL_curstack = c->curstack; 327 PL_curstack = c->curstack;
292 PL_mainstack = c->mainstack; 328 PL_mainstack = c->mainstack;
293 PL_stack_sp = c->stack_sp; 329 PL_stack_sp = c->stack_sp;
294 PL_op = c->op; 330 PL_op = c->op;
295 PL_curpad = c->curpad; 331 PL_curpad = c->curpad;
332 PL_comppad = c->comppad;
333 PL_compcv = c->compcv;
296 PL_stack_base = c->stack_base; 334 PL_stack_base = c->stack_base;
297 PL_stack_max = c->stack_max; 335 PL_stack_max = c->stack_max;
298 PL_tmps_stack = c->tmps_stack; 336 PL_tmps_stack = c->tmps_stack;
299 PL_tmps_floor = c->tmps_floor; 337 PL_tmps_floor = c->tmps_floor;
300 PL_tmps_ix = c->tmps_ix; 338 PL_tmps_ix = c->tmps_ix;
327 { 365 {
328 AV *padlist = (AV *)POPs; 366 AV *padlist = (AV *)POPs;
329 367
330 if (padlist) 368 if (padlist)
331 { 369 {
332 put_padlist (cv); /* mark this padlist as available */ 370 put_padlist (aTHX_ cv); /* mark this padlist as available */
333 CvPADLIST(cv) = padlist; 371 CvPADLIST(cv) = padlist;
334#ifdef USE_THREADS
335 /*CvOWNER(cv) = (struct perl_thread *)POPs;*/
336#endif
337 } 372 }
338 373
339 ++CvDEPTH(cv); 374 ++CvDEPTH(cv);
340 } 375 }
341 376
368 if (CxTYPE(cx) == CXt_SUB) 403 if (CxTYPE(cx) == CXt_SUB)
369 { 404 {
370 CV *cv = cx->blk_sub.cv; 405 CV *cv = cx->blk_sub.cv;
371 if (CvDEPTH(cv)) 406 if (CvDEPTH(cv))
372 { 407 {
373#ifdef USE_THREADS
374 /*XPUSHs ((SV *)CvOWNER(cv));*/
375 /*CvOWNER(cv) = 0;*/
376 /*error must unlock this cv etc.. etc...*/
377#endif
378 EXTEND (SP, CvDEPTH(cv)*2); 408 EXTEND (SP, CvDEPTH(cv)*2);
379 409
380 while (--CvDEPTH(cv)) 410 while (--CvDEPTH(cv))
381 { 411 {
382 /* this tells the restore code to increment CvDEPTH */ 412 /* this tells the restore code to increment CvDEPTH */
385 } 415 }
386 416
387 PUSHs ((SV *)CvPADLIST(cv)); 417 PUSHs ((SV *)CvPADLIST(cv));
388 PUSHs ((SV *)cv); 418 PUSHs ((SV *)cv);
389 419
390 get_padlist (cv); /* this is a monster */ 420 get_padlist (aTHX_ cv); /* this is a monster */
391 } 421 }
392 } 422 }
423#ifdef CXt_FORMAT
393 else if (CxTYPE(cx) == CXt_FORMAT) 424 else if (CxTYPE(cx) == CXt_FORMAT)
394 { 425 {
395 /* I never used formats, so how should I know how these are implemented? */ 426 /* I never used formats, so how should I know how these are implemented? */
396 /* my bold guess is as a simple, plain sub... */ 427 /* my bold guess is as a simple, plain sub... */
397 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats"); 428 croak ("CXt_FORMAT not yet handled. Don't switch coroutines from within formats");
398 } 429 }
430#endif
399 } 431 }
400 432
401 if (top_si->si_type == PERLSI_MAIN) 433 if (top_si->si_type == PERLSI_MAIN)
402 break; 434 break;
403 435
420 c->curstack = PL_curstack; 452 c->curstack = PL_curstack;
421 c->mainstack = PL_mainstack; 453 c->mainstack = PL_mainstack;
422 c->stack_sp = PL_stack_sp; 454 c->stack_sp = PL_stack_sp;
423 c->op = PL_op; 455 c->op = PL_op;
424 c->curpad = PL_curpad; 456 c->curpad = PL_curpad;
457 c->comppad = PL_comppad;
458 c->compcv = PL_compcv;
425 c->stack_base = PL_stack_base; 459 c->stack_base = PL_stack_base;
426 c->stack_max = PL_stack_max; 460 c->stack_max = PL_stack_max;
427 c->tmps_stack = PL_tmps_stack; 461 c->tmps_stack = PL_tmps_stack;
428 c->tmps_floor = PL_tmps_floor; 462 c->tmps_floor = PL_tmps_floor;
429 c->tmps_ix = PL_tmps_ix; 463 c->tmps_ix = PL_tmps_ix;
445} 479}
446 480
447/* 481/*
448 * allocate various perl stacks. This is an exact copy 482 * allocate various perl stacks. This is an exact copy
449 * of perl.c:init_stacks, except that it uses less memory 483 * of perl.c:init_stacks, except that it uses less memory
450 * on the assumption that coroutines do not usually need 484 * on the (sometimes correct) assumption that coroutines do
451 * a lot of stackspace. 485 * not usually need a lot of stackspace.
452 */ 486 */
453STATIC void 487STATIC void
454coro_init_stacks (pTHX) 488coro_init_stacks (pTHX)
455{ 489{
490 LOCK;
491
456 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 492 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
457 PL_curstackinfo->si_type = PERLSI_MAIN; 493 PL_curstackinfo->si_type = PERLSI_MAIN;
458 PL_curstack = PL_curstackinfo->si_stack; 494 PL_curstack = PL_curstackinfo->si_stack;
459 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 495 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
460 496
469 505
470 New(54,PL_markstack,16,I32); 506 New(54,PL_markstack,16,I32);
471 PL_markstack_ptr = PL_markstack; 507 PL_markstack_ptr = PL_markstack;
472 PL_markstack_max = PL_markstack + 16; 508 PL_markstack_max = PL_markstack + 16;
473 509
510#ifdef SET_MARK_OFFSET
474 SET_MARK_OFFSET; 511 SET_MARK_OFFSET;
512#endif
475 513
476 New(54,PL_scopestack,16,I32); 514 New(54,PL_scopestack,16,I32);
477 PL_scopestack_ix = 0; 515 PL_scopestack_ix = 0;
478 PL_scopestack_max = 16; 516 PL_scopestack_max = 16;
479 517
482 PL_savestack_max = 96; 520 PL_savestack_max = 96;
483 521
484 New(54,PL_retstack,8,OP*); 522 New(54,PL_retstack,8,OP*);
485 PL_retstack_ix = 0; 523 PL_retstack_ix = 0;
486 PL_retstack_max = 8; 524 PL_retstack_max = 8;
525
526 UNLOCK;
487} 527}
488 528
489/* 529/*
490 * destroy the stacks, the callchain etc... 530 * destroy the stacks, the callchain etc...
491 * still there is a memleak of 128 bytes...
492 */ 531 */
493STATIC void 532STATIC void
494destroy_stacks(pTHX) 533destroy_stacks(pTHX)
495{ 534{
496 if (!IN_DESTRUCT) 535 if (!IN_DESTRUCT)
497 { 536 {
498 /* is this ugly, I ask? */ 537 /* is this ugly, I ask? */
499 while (PL_scopestack_ix) 538 LEAVE_SCOPE (0);
500 LEAVE;
501 539
502 /* sure it is, but more important: is it correct?? :/ */ 540 /* sure it is, but more important: is it correct?? :/ */
503 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
504 FREETMPS; 541 FREETMPS;
542
543 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/
505 } 544 }
506 545
507 while (PL_curstackinfo->si_next) 546 while (PL_curstackinfo->si_next)
508 PL_curstackinfo = PL_curstackinfo->si_next; 547 PL_curstackinfo = PL_curstackinfo->si_next;
509 548
510 while (PL_curstackinfo) 549 while (PL_curstackinfo)
511 { 550 {
512 PERL_SI *p = PL_curstackinfo->si_prev; 551 PERL_SI *p = PL_curstackinfo->si_prev;
513 552
514 { 553 { /*D*//*remove*/
515 dSP; 554 dSP;
516 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 555 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
517 PUTBACK; /* possibly superfluous */ 556 PUTBACK; /* possibly superfluous */
518 } 557 }
519 558
520 if (!IN_DESTRUCT) 559 if (!IN_DESTRUCT)
521 { 560 {
522 dounwind(-1); 561 dounwind (-1);/*D*//*remove*/
523 SvREFCNT_dec(PL_curstackinfo->si_stack); 562 SvREFCNT_dec (PL_curstackinfo->si_stack);
524 } 563 }
525 564
526 Safefree(PL_curstackinfo->si_cxstack); 565 Safefree (PL_curstackinfo->si_cxstack);
527 Safefree(PL_curstackinfo); 566 Safefree (PL_curstackinfo);
528 PL_curstackinfo = p; 567 PL_curstackinfo = p;
529 } 568 }
530 569
531 Safefree(PL_tmps_stack); 570 Safefree (PL_tmps_stack);
532 Safefree(PL_markstack); 571 Safefree (PL_markstack);
533 Safefree(PL_scopestack); 572 Safefree (PL_scopestack);
534 Safefree(PL_savestack); 573 Safefree (PL_savestack);
535 Safefree(PL_retstack); 574 Safefree (PL_retstack);
536} 575}
537 576
538static void 577static void
539allocate_stack (Coro__State ctx, int alloc) 578allocate_stack (Coro__State ctx, int alloc)
540{ 579{
543 New (0, stack, 1, coro_stack); 582 New (0, stack, 1, coro_stack);
544 583
545 stack->refcnt = 1; 584 stack->refcnt = 1;
546 stack->usecnt = 1; 585 stack->usecnt = 1;
547 stack->gencnt = ctx->gencnt = 0; 586 stack->gencnt = ctx->gencnt = 0;
587
548 if (alloc) 588 if (alloc)
549 { 589 {
550#if HAVE_MMAP 590#if HAVE_MMAP
551 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 591 stack->ssize = 16384 * sizeof (long); /* mmap should do allocate-on-write for us */
552 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 592 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
553 if (stack->sptr == (void *)-1) 593 if (stack->sptr == (void *)-1)
554#endif 594#endif
555 { 595 {
556 /*FIXME*//*D*//* reasonable stack size! */ 596 /*FIXME*//*D*//* reasonable stack size! */
557 stack->ssize = -4096 * sizeof (long); 597 stack->ssize = - (8192 * sizeof (long));
558 New (0, stack->sptr, 4096, long); 598 New (0, stack->sptr, 8192, long);
559 } 599 }
560 } 600 }
561 else 601 else
562 stack->sptr = 0; 602 stack->sptr = 0;
563 603
577 { 617 {
578#ifdef HAVE_MMAP 618#ifdef HAVE_MMAP
579 if (stack->ssize > 0 && stack->sptr) 619 if (stack->ssize > 0 && stack->sptr)
580 munmap (stack->sptr, stack->ssize); 620 munmap (stack->sptr, stack->ssize);
581 else 621 else
582#else 622#endif
583 Safefree (stack->sptr); 623 Safefree (stack->sptr);
584#endif 624
585 Safefree (stack); 625 Safefree (stack);
586 } 626 }
587 else if (ctx->gencnt == stack->gencnt) 627 else if (ctx->gencnt == stack->gencnt)
588 --stack->usecnt; 628 --stack->usecnt;
589 } 629 }
593setup_coro (void *arg) 633setup_coro (void *arg)
594{ 634{
595 /* 635 /*
596 * emulate part of the perl startup here. 636 * emulate part of the perl startup here.
597 */ 637 */
638 dTHX;
598 dSP; 639 dSP;
599 Coro__State ctx = (Coro__State)arg; 640 Coro__State ctx = (Coro__State)arg;
600 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 641 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
601 642
602 coro_init_stacks (aTHX); 643 coro_init_stacks (aTHX);
603 PL_curpm = 0; /* segfault on first access */
604 /*PL_curcop = 0;*/ 644 /*PL_curcop = 0;*/
605 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 645 /*PL_in_eval = PL_in_eval;*/ /* inherit */
606 SvREFCNT_dec (GvAV (PL_defgv)); 646 SvREFCNT_dec (GvAV (PL_defgv));
607 GvAV (PL_defgv) = ctx->args; 647 GvAV (PL_defgv) = ctx->args; ctx->args = 0;
608 648
609 SPAGAIN; 649 SPAGAIN;
610 650
611 if (ctx->stack) 651 if (ctx->stack)
612 { 652 {
639 * that doesn't matter, though, since it is only 679 * that doesn't matter, though, since it is only
640 * pp_nextstate and we never return... 680 * pp_nextstate and we never return...
641 * ah yes, and I don't care anyways ;) 681 * ah yes, and I don't care anyways ;)
642 */ 682 */
643 PUTBACK; 683 PUTBACK;
644 PL_op = pp_entersub(); 684 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
645 SPAGAIN; 685 SPAGAIN;
646 686
647 ENTER; /* necessary e.g. for dounwind */ 687 ENTER; /* necessary e.g. for dounwind */
648 } 688 }
649} 689}
652continue_coro (void *arg) 692continue_coro (void *arg)
653{ 693{
654 /* 694 /*
655 * this is a _very_ stripped down perl interpreter ;) 695 * this is a _very_ stripped down perl interpreter ;)
656 */ 696 */
697 dTHX;
657 Coro__State ctx = (Coro__State)arg; 698 Coro__State ctx = (Coro__State)arg;
658 JMPENV coro_start_env; 699 JMPENV coro_start_env;
659 700
660 /* same as JMPENV_BOOTSTRAP */
661 Zero(&coro_start_env, 1, JMPENV);
662 coro_start_env.je_ret = -1;
663 coro_start_env.je_mustcatch = TRUE;
664 PL_top_env = &coro_start_env; 701 PL_top_env = &ctx->start_env;
665 702
666 ctx->cursp = 0; 703 ctx->cursp = 0;
667 PL_op = PL_op->op_next; 704 PL_op = PL_op->op_next;
668 CALLRUNOPS(aTHX); 705 CALLRUNOPS(aTHX);
669 706
670 abort (); 707 abort ();
671} 708}
672 709
673STATIC void 710STATIC void
674transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 711transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
675{ 712{
676 dSTACKLEVEL; 713 dSTACKLEVEL;
677 static struct coro *xnext;
678 714
679 if (prev != next) 715 if (prev != next)
680 { 716 {
681 xnext = next;
682
683 if (next->mainstack) 717 if (next->mainstack)
684 { 718 {
719 LOCK;
685 SAVE (prev, flags); 720 SAVE (prev, flags);
686 LOAD (next); 721 LOAD (next);
722 UNLOCK;
687 723
688 /* mark this state as in-use */ 724 /* mark this state as in-use */
689 next->mainstack = 0; 725 next->mainstack = 0;
690 next->tmps_ix = -2; 726 next->tmps_ix = -2;
691 727
710 continue_coro, (void *)next, 746 continue_coro, (void *)next,
711 next->stack->sptr, labs (next->stack->ssize)); 747 next->stack->sptr, labs (next->stack->ssize));
712 } 748 }
713 749
714 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 750 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
751 prev->cursp = stacklevel;
715 /* don't add any code here */ 752 /* don't add any code here */
716 } 753 }
717 754 else
755 next->cursp = stacklevel;
718 } 756 }
719 else if (next->tmps_ix == -2) 757 else if (next->tmps_ix == -2)
720 croak ("tried to transfer to running coroutine"); 758 croak ("tried to transfer to running coroutine");
721 else 759 else
722 { 760 {
761 LOCK;
723 SAVE (prev, -1); /* first get rid of the old state */ 762 SAVE (prev, -1); /* first get rid of the old state */
763 UNLOCK;
724 764
725 if (flags & TRANSFER_SAVE_CCTXT) 765 if (flags & TRANSFER_SAVE_CCTXT)
726 { 766 {
727 if (!prev->stack) 767 if (!prev->stack)
728 allocate_stack (prev, 0); 768 allocate_stack (prev, 0);
729 769
730 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 770 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
731 { 771 {
772 PL_top_env = &next->start_env;
773
732 setup_coro (next); 774 setup_coro (next);
775 next->cursp = stacklevel;
733 776
734 prev->stack->refcnt++; 777 prev->stack->refcnt++;
735 prev->stack->usecnt++; 778 prev->stack->usecnt++;
736 next->stack = prev->stack; 779 next->stack = prev->stack;
737 next->gencnt = prev->gencnt; 780 next->gencnt = prev->gencnt;
738 } 781 }
739 else 782 else
740 { 783 {
784 assert (!next->stack);
741 allocate_stack (next, 1); 785 allocate_stack (next, 1);
742 coro_create (&(next->stack->cctx), 786 coro_create (&(next->stack->cctx),
743 setup_coro, (void *)next, 787 setup_coro, (void *)next,
744 next->stack->sptr, labs (next->stack->ssize)); 788 next->stack->sptr, labs (next->stack->ssize));
745 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 789 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
790 prev->cursp = stacklevel;
746 /* don't add any code here */ 791 /* don't add any code here */
747 } 792 }
748 } 793 }
749 else 794 else
795 {
750 setup_coro (next); 796 setup_coro (next);
797 next->cursp = stacklevel;
798 }
751 } 799 }
752
753 /*
754 * xnext is now either prev or next, depending on wether
755 * we switched the c stack or not. that's why i use a global
756 * variable, that should become thread-specific at one point.
757 */
758 xnext->cursp = stacklevel;
759 } 800 }
760 801
802 LOCK;
761 if (coro_mortal) 803 if (coro_mortal)
762 { 804 {
763 SvREFCNT_dec (coro_mortal); 805 SvREFCNT_dec (coro_mortal);
764 coro_mortal = 0; 806 coro_mortal = 0;
765 } 807 }
808 UNLOCK;
766} 809}
767 810
768#define SV_CORO(sv,func) \ 811#define SV_CORO(sv,func) \
769 do { \ 812 do { \
770 if (SvROK (sv)) \ 813 if (SvROK (sv)) \
771 sv = SvRV (sv); \ 814 sv = SvRV (sv); \
772 \ 815 \
773 if (SvTYPE(sv) == SVt_PVHV) \ 816 if (SvTYPE (sv) == SVt_PVHV) \
774 { \ 817 { \
775 HE *he = hv_fetch_ent((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \ 818 HE *he = hv_fetch_ent ((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
776 \ 819 \
777 if (!he) \ 820 if (!he) \
778 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \ 821 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
779 \ 822 \
780 (sv) = SvRV (HeVAL(he)); \ 823 (sv) = SvRV (HeVAL(he)); \
781 } \ 824 } \
782 \ 825 \
783 /* must also be changed inside Coro::Cont::yield */ \ 826 /* must also be changed inside Coro::Cont::yield */ \
784 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \ 827 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
785 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \ 828 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
786 \ 829 \
787 } while(0) 830 } while(0)
788 831
789#define SvSTATE(sv) (struct coro *)SvIV (sv) 832#define SvSTATE(sv) (struct coro *)SvIV (sv)
792api_transfer(pTHX_ SV *prev, SV *next, int flags) 835api_transfer(pTHX_ SV *prev, SV *next, int flags)
793{ 836{
794 SV_CORO (prev, "Coro::transfer"); 837 SV_CORO (prev, "Coro::transfer");
795 SV_CORO (next, "Coro::transfer"); 838 SV_CORO (next, "Coro::transfer");
796 839
797 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags); 840 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
798} 841}
799 842
800/** Coro ********************************************************************/ 843/** Coro ********************************************************************/
801 844
802#define PRIO_MAX 3 845#define PRIO_MAX 3
810static GV *coro_current, *coro_idle; 853static GV *coro_current, *coro_idle;
811static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 854static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
812static int coro_nready; 855static int coro_nready;
813 856
814static void 857static void
815coro_enq (SV *sv) 858coro_enq (pTHX_ SV *sv)
816{ 859{
817 if (SvTYPE (sv) == SVt_PVHV) 860 if (SvTYPE (sv) == SVt_PVHV)
818 { 861 {
819 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0); 862 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
820 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL; 863 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
831 874
832 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 875 croak ("Coro::ready tried to enqueue something that is not a coroutine");
833} 876}
834 877
835static SV * 878static SV *
836coro_deq (int min_prio) 879coro_deq (pTHX_ int min_prio)
837{ 880{
838 int prio = PRIO_MAX - PRIO_MIN; 881 int prio = PRIO_MAX - PRIO_MIN;
839 882
840 min_prio -= PRIO_MIN; 883 min_prio -= PRIO_MIN;
841 if (min_prio < 0) 884 if (min_prio < 0)
852} 895}
853 896
854static void 897static void
855api_ready (SV *coro) 898api_ready (SV *coro)
856{ 899{
900 dTHX;
901
857 if (SvROK (coro)) 902 if (SvROK (coro))
858 coro = SvRV (coro); 903 coro = SvRV (coro);
859 904
905 LOCK;
860 coro_enq (SvREFCNT_inc (coro)); 906 coro_enq (aTHX_ SvREFCNT_inc (coro));
907 UNLOCK;
861} 908}
862 909
863static void 910static void
864api_schedule (void) 911api_schedule (void)
865{ 912{
913 dTHX;
914
866 SV *prev, *next; 915 SV *prev, *next;
867 916
917 LOCK;
918
868 prev = SvRV (GvSV (coro_current)); 919 prev = SvRV (GvSV (coro_current));
869 next = coro_deq (PRIO_MIN); 920 next = coro_deq (aTHX_ PRIO_MIN);
870 921
871 if (!next) 922 if (!next)
872 next = SvREFCNT_inc (SvRV (GvSV (coro_idle))); 923 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
873 924
874 /* free this only after the transfer */ 925 /* free this only after the transfer */
877 928
878 SvRV (GvSV (coro_current)) = next; 929 SvRV (GvSV (coro_current)) = next;
879 930
880 SV_CORO (next, "Coro::schedule"); 931 SV_CORO (next, "Coro::schedule");
881 932
933 UNLOCK;
934
882 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), 935 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
883 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 936 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
884} 937}
885 938
886static void 939static void
887api_cede (void) 940api_cede (void)
888{ 941{
942 dTHX;
943
944 LOCK;
889 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current)))); 945 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
946 UNLOCK;
890 947
891 api_schedule (); 948 api_schedule ();
892} 949}
893 950
894MODULE = Coro::State PACKAGE = Coro::State 951MODULE = Coro::State PACKAGE = Coro::State
895 952
896PROTOTYPES: ENABLE 953PROTOTYPES: ENABLE
897 954
898BOOT: 955BOOT:
899{ /* {} necessary for stoopid perl-5.6.x */ 956{ /* {} necessary for stoopid perl-5.6.x */
957#ifdef USE_ITHREADS
958 MUTEX_INIT (&coro_mutex);
959#endif
960
900 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 961 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
901 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 962 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
902 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 963 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
903 964
904 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 965 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
905 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 966 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
906 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 967 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
907 newCONSTSUB (coro_state_stash, "SAVE_CURPM", newSViv (TRANSFER_SAVE_CURPM));
908 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT)); 968 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
909
910 if (!padlist_cache)
911 padlist_cache = newHV ();
912 969
913 main_mainstack = PL_mainstack; 970 main_mainstack = PL_mainstack;
914 971
915 coroapi.ver = CORO_API_VERSION; 972 coroapi.ver = CORO_API_VERSION;
916 coroapi.transfer = api_transfer; 973 coroapi.transfer = api_transfer;
924 Coro__State coro; 981 Coro__State coro;
925 982
926 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV) 983 if (!SvROK (args) || SvTYPE (SvRV (args)) != SVt_PVAV)
927 croak ("Coro::State::_newprocess expects an arrayref"); 984 croak ("Coro::State::_newprocess expects an arrayref");
928 985
929 New (0, coro, 1, struct coro); 986 Newz (0, coro, 1, struct coro);
930 987
931 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 988 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
932 coro->mainstack = 0; /* actual work is done inside transfer */ 989 /*coro->mainstack = 0; *//*actual work is done inside transfer */
933 coro->stack = 0; 990 /*coro->stack = 0;*/
991
992 /* same as JMPENV_BOOTSTRAP */
993 /* we might be able to recycle start_env, but safe is safe */
994 /*Zero(&coro->start_env, 1, JMPENV);*/
995 coro->start_env.je_ret = -1;
996 coro->start_env.je_mustcatch = TRUE;
934 997
935 RETVAL = coro; 998 RETVAL = coro;
936 OUTPUT: 999 OUTPUT:
937 RETVAL 1000 RETVAL
938 1001
957 if (coro->mainstack && coro->mainstack != main_mainstack) 1020 if (coro->mainstack && coro->mainstack != main_mainstack)
958 { 1021 {
959 struct coro temp; 1022 struct coro temp;
960 1023
961 PUTBACK; 1024 PUTBACK;
962 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 1025 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
963 LOAD(aTHX_ coro); 1026 LOAD (aTHX_ coro);
964 SPAGAIN; 1027 SPAGAIN;
965 1028
966 destroy_stacks (aTHX); 1029 destroy_stacks (aTHX);
967 1030
968 LOAD((&temp)); /* this will get rid of defsv etc.. */ 1031 LOAD ((&temp)); /* this will get rid of defsv etc.. */
969 SPAGAIN; 1032 SPAGAIN;
970 1033
971 coro->mainstack = 0; 1034 coro->mainstack = 0;
972 } 1035 }
973 1036
974 deallocate_stack (coro); 1037 deallocate_stack (coro);
975 1038 SvREFCNT_dec (coro->args);
976 Safefree (coro); 1039 Safefree (coro);
977
978void
979flush()
980 CODE:
981#ifdef MAY_FLUSH
982 flush_padlist_cache ();
983#endif
984 1040
985void 1041void
986_exit(code) 1042_exit(code)
987 int code 1043 int code
988 PROTOTYPE: $ 1044 PROTOTYPE: $
989 CODE: 1045 CODE:
990#if defined(__GLIBC__) || _POSIX_C_SOURCE
991 _exit (code); 1046 _exit (code);
992#else
993 signal (SIGTERM, SIG_DFL);
994 raise (SIGTERM);
995 exit (code);
996#endif
997 1047
998MODULE = Coro::State PACKAGE = Coro::Cont 1048MODULE = Coro::State PACKAGE = Coro::Cont
999 1049
1000# this is slightly dirty (should expose a c-level api) 1050# this is slightly dirty (should expose a c-level api)
1001 1051
1002void 1052void
1003yield(...) 1053yield(...)
1004 PROTOTYPE: @ 1054 PROTOTYPE: @
1005 CODE: 1055 CODE:
1006 static SV *returnstk; 1056 SV *yieldstack;
1007 SV *sv; 1057 SV *sv;
1008 AV *defav = GvAV (PL_defgv); 1058 AV *defav = GvAV (PL_defgv);
1009 struct coro *prev, *next; 1059 struct coro *prev, *next;
1010 1060
1011 if (!returnstk) 1061 yieldstack = *hv_fetch (
1012 returnstk = SvRV (get_sv ("Coro::Cont::return", FALSE)); 1062 (HV *)SvRV (GvSV (coro_current)),
1063 "yieldstack", sizeof ("yieldstack") - 1,
1064 0
1065 );
1013 1066
1014 /* set up @_ -- ugly */ 1067 /* set up @_ -- ugly */
1015 av_clear (defav); 1068 av_clear (defav);
1016 av_fill (defav, items - 1); 1069 av_fill (defav, items - 1);
1017 while (items--) 1070 while (items--)
1018 av_store (defav, items, SvREFCNT_inc (ST(items))); 1071 av_store (defav, items, SvREFCNT_inc (ST(items)));
1019 1072
1020 mg_get (returnstk); /* isn't documentation wrong for mg_get? */
1021 sv = av_pop ((AV *)SvRV (returnstk)); 1073 sv = av_pop ((AV *)SvRV (yieldstack));
1022 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))); 1074 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0)));
1023 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))); 1075 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0)));
1024 SvREFCNT_dec (sv); 1076 SvREFCNT_dec (sv);
1025 1077
1026 transfer(aTHX_ prev, next, 0); 1078 transfer (aTHX_ prev, next, 0);
1027 1079
1028MODULE = Coro::State PACKAGE = Coro 1080MODULE = Coro::State PACKAGE = Coro
1029 1081
1030# this is slightly dirty (should expose a c-level api) 1082# this is slightly dirty (should expose a c-level api)
1031 1083
1060 sv_setiv(sv, (IV)&coroapi); 1112 sv_setiv(sv, (IV)&coroapi);
1061 SvREADONLY_on(sv); 1113 SvREADONLY_on(sv);
1062 } 1114 }
1063} 1115}
1064 1116
1117#if !PERL_MICRO
1118
1065void 1119void
1066ready(self) 1120ready(self)
1067 SV * self 1121 SV * self
1068 PROTOTYPE: $ 1122 PROTOTYPE: $
1069 CODE: 1123 CODE:
1070 api_ready (self); 1124 api_ready (self);
1125
1126#endif
1071 1127
1072int 1128int
1073nready(...) 1129nready(...)
1074 PROTOTYPE: 1130 PROTOTYPE:
1075 CODE: 1131 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines