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.49 by pcg, Sun Nov 23 03:34:13 2003 UTC vs.
Revision 1.71 by root, Wed Jan 25 21:43:58 2006 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 "patchlevel.h" 9#include "patchlevel.h"
6 10
7#if PATCHLEVEL < 6 11#if PERL_VERSION < 6
8# ifndef PL_ppaddr 12# ifndef PL_ppaddr
9# define PL_ppaddr ppaddr 13# define PL_ppaddr ppaddr
10# endif 14# endif
11# ifndef call_sv 15# ifndef call_sv
12# define call_sv perl_call_sv 16# define call_sv perl_call_sv
23# ifndef IS_PADCONST 27# ifndef IS_PADCONST
24# define IS_PADCONST(v) 0 28# define IS_PADCONST(v) 0
25# endif 29# endif
26#endif 30#endif
27 31
28#include "libcoro/coro.c" 32#include <errno.h>
29
30#include <signal.h> 33#include <signal.h>
31 34
32#ifdef HAVE_MMAP 35#ifdef HAVE_MMAP
33# include <unistd.h> 36# include <unistd.h>
34# include <sys/mman.h> 37# include <sys/mman.h>
39# undef HAVE_MMAP 42# undef HAVE_MMAP
40# endif 43# endif
41# endif 44# endif
42#endif 45#endif
43 46
44#define MAY_FLUSH /* increases codesize and is rarely used */
45
46#define SUB_INIT "Coro::State::initialize" 47#define SUB_INIT "Coro::State::initialize"
47#define UCORO_STATE "_coro_state" 48#define UCORO_STATE "_coro_state"
48 49
49/* The next macro should declare a variable stacklevel that contains and approximation 50/* The next macro should declare a variable stacklevel that contains and approximation
50 * to the current C stack pointer. Its property is that it changes with each call 51 * to the current C stack pointer. Its property is that it changes with each call
55 56
56#define labs(l) ((l) >= 0 ? (l) : -(l)) 57#define labs(l) ((l) >= 0 ? (l) : -(l))
57 58
58#include "CoroAPI.h" 59#include "CoroAPI.h"
59 60
61#ifdef USE_ITHREADS
62static perl_mutex coro_mutex;
63# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
64# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
65#else
66# define LOCK (void)0
67# define UNLOCK (void)0
68#endif
69
60static struct CoroAPI coroapi; 70static struct CoroAPI coroapi;
71static AV *main_mainstack; /* used to differentiate between $main and others */
72static HV *coro_state_stash;
73static SV *ucoro_state_sv;
74static U32 ucoro_state_hash;
75static SV *coro_mortal; /* will be freed after next transfer */
61 76
62/* this is actually not only the c stack but also c registers etc... */ 77/* this is actually not only the c stack but also c registers etc... */
63typedef struct { 78typedef struct {
64 int refcnt; /* pointer reference counter */ 79 int refcnt; /* pointer reference counter */
65 int usecnt; /* shared by how many coroutines */ 80 int usecnt; /* shared by how many coroutines */
95 AV *mainstack; 110 AV *mainstack;
96 SV **stack_sp; 111 SV **stack_sp;
97 OP *op; 112 OP *op;
98 SV **curpad; 113 SV **curpad;
99 AV *comppad; 114 AV *comppad;
115 CV *compcv;
100 SV **stack_base; 116 SV **stack_base;
101 SV **stack_max; 117 SV **stack_max;
102 SV **tmps_stack; 118 SV **tmps_stack;
103 I32 tmps_floor; 119 I32 tmps_floor;
104 I32 tmps_ix; 120 I32 tmps_ix;
113 I32 savestack_ix; 129 I32 savestack_ix;
114 I32 savestack_max; 130 I32 savestack_max;
115 OP **retstack; 131 OP **retstack;
116 I32 retstack_ix; 132 I32 retstack_ix;
117 I32 retstack_max; 133 I32 retstack_max;
134 PMOP *curpm;
118 COP *curcop; 135 COP *curcop;
119 JMPENV *top_env; 136 JMPENV *top_env;
120 137
121 /* data associated with this coroutine (initial args) */ 138 /* data associated with this coroutine (initial args) */
122 AV *args; 139 AV *args;
123}; 140};
124 141
125typedef struct coro *Coro__State; 142typedef struct coro *Coro__State;
126typedef struct coro *Coro__State_or_hashref; 143typedef struct coro *Coro__State_or_hashref;
127 144
128static AV *main_mainstack; /* used to differentiate between $main and others */
129static HV *coro_state_stash;
130static SV *ucoro_state_sv;
131static U32 ucoro_state_hash;
132static HV *padlist_cache;
133static SV *coro_mortal; /* will be freed after next transfer */
134
135/* mostly copied from op.c:cv_clone2 */ 145/* mostly copied from op.c:cv_clone2 */
136STATIC AV * 146STATIC AV *
137clone_padlist (AV *protopadlist) 147clone_padlist (pTHX_ AV *protopadlist)
138{ 148{
139 AV *av; 149 AV *av;
140 I32 ix; 150 I32 ix;
141 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE); 151 AV *protopad_name = (AV *) * av_fetch (protopadlist, 0, FALSE);
142 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE); 152 AV *protopad = (AV *) * av_fetch (protopadlist, 1, FALSE);
161 av_store (newpadlist, 1, (SV *) newpad); 171 av_store (newpadlist, 1, (SV *) newpad);
162 172
163 av = newAV (); /* will be @_ */ 173 av = newAV (); /* will be @_ */
164 av_extend (av, 0); 174 av_extend (av, 0);
165 av_store (newpad, 0, (SV *) av); 175 av_store (newpad, 0, (SV *) av);
166 AvFLAGS (av) = AVf_REIFY; 176 AvREIFY_on (av);
167 177
168 for (ix = fpad; ix > 0; ix--) 178 for (ix = fpad; ix > 0; ix--)
169 { 179 {
170 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv; 180 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv;
181
171 if (namesv && namesv != &PL_sv_undef) 182 if (namesv && namesv != &PL_sv_undef)
172 { 183 {
173 char *name = SvPVX (namesv); /* XXX */ 184 char *name = SvPVX (namesv); /* XXX */
185
174 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&') 186 if (SvFLAGS (namesv) & SVf_FAKE || *name == '&')
175 { /* lexical from outside? */ 187 { /* lexical from outside? */
176 npad[ix] = SvREFCNT_inc (ppad[ix]); 188 npad[ix] = SvREFCNT_inc (ppad[ix]);
177 } 189 }
178 else 190 else
184 sv = (SV *) newAV (); 196 sv = (SV *) newAV ();
185 else if (*name == '%') 197 else if (*name == '%')
186 sv = (SV *) newHV (); 198 sv = (SV *) newHV ();
187 else 199 else
188 sv = NEWSV (0, 0); 200 sv = NEWSV (0, 0);
201
189#ifdef SvPADBUSY 202#ifdef SvPADBUSY
190 if (!SvPADBUSY (sv)) 203 if (!SvPADBUSY (sv))
191#endif 204#endif
192 SvPADMY_on (sv); 205 SvPADMY_on (sv);
206
193 npad[ix] = sv; 207 npad[ix] = sv;
194 } 208 }
195 } 209 }
196 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 210 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
197 { 211 {
226#endif 240#endif
227 241
228 return newpadlist; 242 return newpadlist;
229} 243}
230 244
231#ifdef MAY_FLUSH
232STATIC void 245STATIC void
233free_padlist (AV *padlist) 246free_padlist (pTHX_ AV *padlist)
234{ 247{
235 /* may be during global destruction */ 248 /* may be during global destruction */
236 if (SvREFCNT(padlist)) 249 if (SvREFCNT (padlist))
237 { 250 {
238 I32 i = AvFILLp(padlist); 251 I32 i = AvFILLp (padlist);
239 while (i >= 0) 252 while (i >= 0)
240 { 253 {
241 SV **svp = av_fetch(padlist, i--, FALSE); 254 SV **svp = av_fetch (padlist, i--, FALSE);
242 SV *sv = svp ? *svp : Nullsv;
243 if (sv) 255 if (svp)
256 {
257 SV *sv;
258 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
244 SvREFCNT_dec(sv); 259 SvREFCNT_dec (sv);
260
261 SvREFCNT_dec (*svp);
262 }
245 } 263 }
246 264
247 SvREFCNT_dec((SV*)padlist); 265 SvREFCNT_dec ((SV*)padlist);
248 } 266 }
249} 267}
250#endif 268
269STATIC int
270coro_cv_free (pTHX_ SV *sv, MAGIC *mg)
271{
272 AV *padlist;
273 AV *av = (AV *)mg->mg_obj;
274
275 /* casting is fun. */
276 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
277 free_padlist (aTHX_ padlist);
278
279 SvREFCNT_dec (av);
280}
281
282#define PERL_MAGIC_coro PERL_MAGIC_ext
283
284static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
251 285
252/* the next two functions merely cache the padlists */ 286/* the next two functions merely cache the padlists */
253STATIC void 287STATIC void
254get_padlist (CV *cv) 288get_padlist (pTHX_ CV *cv)
255{ 289{
256 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 0); 290 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
257 291
258 if (he && AvFILLp ((AV *)*he) >= 0) 292 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
259 CvPADLIST (cv) = (AV *)av_pop ((AV *)*he); 293 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
260 else 294 else
261 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 295 CvPADLIST (cv) = clone_padlist (aTHX_ CvPADLIST (cv));
262} 296}
263 297
264STATIC void 298STATIC void
265put_padlist (CV *cv) 299put_padlist (pTHX_ CV *cv)
266{ 300{
267 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 1); 301 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
268 302
269 if (SvTYPE (*he) != SVt_PVAV) 303 if (!mg)
270 { 304 {
271 SvREFCNT_dec (*he); 305 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
306 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
307 mg->mg_virtual = &vtbl_coro;
272 *he = (SV *)newAV (); 308 mg->mg_obj = (SV *)newAV ();
273 } 309 }
274 310
275 av_push ((AV *)*he, (SV *)CvPADLIST (cv)); 311 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv));
276} 312}
277
278#ifdef MAY_FLUSH
279STATIC void
280flush_padlist_cache ()
281{
282 HV *hv = padlist_cache;
283 padlist_cache = newHV ();
284
285 if (hv_iterinit (hv))
286 {
287 HE *he;
288 AV *padlist;
289
290 while (!!(he = hv_iternext (hv)))
291 {
292 AV *av = (AV *)HeVAL(he);
293
294 /* casting is fun. */
295 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
296 free_padlist (padlist);
297 }
298 }
299
300 SvREFCNT_dec (hv);
301}
302#endif
303 313
304#define SB do { 314#define SB do {
305#define SE } while (0) 315#define SE } while (0)
306 316
307#define LOAD(state) load_state(aTHX_ (state)); 317#define LOAD(state) load_state(aTHX_ (state));
320 PL_mainstack = c->mainstack; 330 PL_mainstack = c->mainstack;
321 PL_stack_sp = c->stack_sp; 331 PL_stack_sp = c->stack_sp;
322 PL_op = c->op; 332 PL_op = c->op;
323 PL_curpad = c->curpad; 333 PL_curpad = c->curpad;
324 PL_comppad = c->comppad; 334 PL_comppad = c->comppad;
335 PL_compcv = c->compcv;
325 PL_stack_base = c->stack_base; 336 PL_stack_base = c->stack_base;
326 PL_stack_max = c->stack_max; 337 PL_stack_max = c->stack_max;
327 PL_tmps_stack = c->tmps_stack; 338 PL_tmps_stack = c->tmps_stack;
328 PL_tmps_floor = c->tmps_floor; 339 PL_tmps_floor = c->tmps_floor;
329 PL_tmps_ix = c->tmps_ix; 340 PL_tmps_ix = c->tmps_ix;
335 PL_scopestack_ix = c->scopestack_ix; 346 PL_scopestack_ix = c->scopestack_ix;
336 PL_scopestack_max = c->scopestack_max; 347 PL_scopestack_max = c->scopestack_max;
337 PL_savestack = c->savestack; 348 PL_savestack = c->savestack;
338 PL_savestack_ix = c->savestack_ix; 349 PL_savestack_ix = c->savestack_ix;
339 PL_savestack_max = c->savestack_max; 350 PL_savestack_max = c->savestack_max;
351#ifdef PL_retstack
340 PL_retstack = c->retstack; 352 PL_retstack = c->retstack;
341 PL_retstack_ix = c->retstack_ix; 353 PL_retstack_ix = c->retstack_ix;
342 PL_retstack_max = c->retstack_max; 354 PL_retstack_max = c->retstack_max;
355#endif
356 PL_curpm = c->curpm;
343 PL_curcop = c->curcop; 357 PL_curcop = c->curcop;
344 PL_top_env = c->top_env; 358 PL_top_env = c->top_env;
345 359
346 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 360 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
347 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 361 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
356 { 370 {
357 AV *padlist = (AV *)POPs; 371 AV *padlist = (AV *)POPs;
358 372
359 if (padlist) 373 if (padlist)
360 { 374 {
361 put_padlist (cv); /* mark this padlist as available */ 375 put_padlist (aTHX_ cv); /* mark this padlist as available */
362 CvPADLIST(cv) = padlist; 376 CvPADLIST(cv) = padlist;
363#ifdef USE_THREADS
364 /*CvOWNER(cv) = (struct perl_thread *)POPs;*/
365#endif
366 } 377 }
367 378
368 ++CvDEPTH(cv); 379 ++CvDEPTH(cv);
369 } 380 }
370 381
397 if (CxTYPE(cx) == CXt_SUB) 408 if (CxTYPE(cx) == CXt_SUB)
398 { 409 {
399 CV *cv = cx->blk_sub.cv; 410 CV *cv = cx->blk_sub.cv;
400 if (CvDEPTH(cv)) 411 if (CvDEPTH(cv))
401 { 412 {
402#ifdef USE_THREADS
403 /*XPUSHs ((SV *)CvOWNER(cv));*/
404 /*CvOWNER(cv) = 0;*/
405 /*error must unlock this cv etc.. etc...*/
406#endif
407 EXTEND (SP, CvDEPTH(cv)*2); 413 EXTEND (SP, CvDEPTH(cv)*2);
408 414
409 while (--CvDEPTH(cv)) 415 while (--CvDEPTH(cv))
410 { 416 {
411 /* this tells the restore code to increment CvDEPTH */ 417 /* this tells the restore code to increment CvDEPTH */
414 } 420 }
415 421
416 PUSHs ((SV *)CvPADLIST(cv)); 422 PUSHs ((SV *)CvPADLIST(cv));
417 PUSHs ((SV *)cv); 423 PUSHs ((SV *)cv);
418 424
419 get_padlist (cv); /* this is a monster */ 425 get_padlist (aTHX_ cv); /* this is a monster */
420 } 426 }
421 } 427 }
422#ifdef CXt_FORMAT 428#ifdef CXt_FORMAT
423 else if (CxTYPE(cx) == CXt_FORMAT) 429 else if (CxTYPE(cx) == CXt_FORMAT)
424 { 430 {
452 c->mainstack = PL_mainstack; 458 c->mainstack = PL_mainstack;
453 c->stack_sp = PL_stack_sp; 459 c->stack_sp = PL_stack_sp;
454 c->op = PL_op; 460 c->op = PL_op;
455 c->curpad = PL_curpad; 461 c->curpad = PL_curpad;
456 c->comppad = PL_comppad; 462 c->comppad = PL_comppad;
463 c->compcv = PL_compcv;
457 c->stack_base = PL_stack_base; 464 c->stack_base = PL_stack_base;
458 c->stack_max = PL_stack_max; 465 c->stack_max = PL_stack_max;
459 c->tmps_stack = PL_tmps_stack; 466 c->tmps_stack = PL_tmps_stack;
460 c->tmps_floor = PL_tmps_floor; 467 c->tmps_floor = PL_tmps_floor;
461 c->tmps_ix = PL_tmps_ix; 468 c->tmps_ix = PL_tmps_ix;
467 c->scopestack_ix = PL_scopestack_ix; 474 c->scopestack_ix = PL_scopestack_ix;
468 c->scopestack_max = PL_scopestack_max; 475 c->scopestack_max = PL_scopestack_max;
469 c->savestack = PL_savestack; 476 c->savestack = PL_savestack;
470 c->savestack_ix = PL_savestack_ix; 477 c->savestack_ix = PL_savestack_ix;
471 c->savestack_max = PL_savestack_max; 478 c->savestack_max = PL_savestack_max;
479#ifdef PL_retstack
472 c->retstack = PL_retstack; 480 c->retstack = PL_retstack;
473 c->retstack_ix = PL_retstack_ix; 481 c->retstack_ix = PL_retstack_ix;
474 c->retstack_max = PL_retstack_max; 482 c->retstack_max = PL_retstack_max;
483#endif
484 c->curpm = PL_curpm;
475 c->curcop = PL_curcop; 485 c->curcop = PL_curcop;
476 c->top_env = PL_top_env; 486 c->top_env = PL_top_env;
477} 487}
478 488
479/* 489/*
480 * allocate various perl stacks. This is an exact copy 490 * allocate various perl stacks. This is an exact copy
481 * of perl.c:init_stacks, except that it uses less memory 491 * of perl.c:init_stacks, except that it uses less memory
482 * on the assumption that coroutines do not usually need 492 * on the (sometimes correct) assumption that coroutines do
483 * a lot of stackspace. 493 * not usually need a lot of stackspace.
484 */ 494 */
485STATIC void 495STATIC void
486coro_init_stacks (pTHX) 496coro_init_stacks (pTHX)
487{ 497{
498 LOCK;
499
488 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 500 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
489 PL_curstackinfo->si_type = PERLSI_MAIN; 501 PL_curstackinfo->si_type = PERLSI_MAIN;
490 PL_curstack = PL_curstackinfo->si_stack; 502 PL_curstack = PL_curstackinfo->si_stack;
491 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 503 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
492 504
513 525
514 New(54,PL_savestack,96,ANY); 526 New(54,PL_savestack,96,ANY);
515 PL_savestack_ix = 0; 527 PL_savestack_ix = 0;
516 PL_savestack_max = 96; 528 PL_savestack_max = 96;
517 529
530#ifdef PL_retstack
518 New(54,PL_retstack,8,OP*); 531 New(54,PL_retstack,8,OP*);
519 PL_retstack_ix = 0; 532 PL_retstack_ix = 0;
520 PL_retstack_max = 8; 533 PL_retstack_max = 8;
534#endif
535
536 UNLOCK;
521} 537}
522 538
523/* 539/*
524 * destroy the stacks, the callchain etc... 540 * destroy the stacks, the callchain etc...
525 */ 541 */
527destroy_stacks(pTHX) 543destroy_stacks(pTHX)
528{ 544{
529 if (!IN_DESTRUCT) 545 if (!IN_DESTRUCT)
530 { 546 {
531 /* is this ugly, I ask? */ 547 /* is this ugly, I ask? */
532 while (PL_scopestack_ix) 548 LEAVE_SCOPE (0);
533 LEAVE;
534 549
535 /* sure it is, but more important: is it correct?? :/ */ 550 /* sure it is, but more important: is it correct?? :/ */
536 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
537 FREETMPS; 551 FREETMPS;
552
553 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/
538 } 554 }
539 555
540 while (PL_curstackinfo->si_next) 556 while (PL_curstackinfo->si_next)
541 PL_curstackinfo = PL_curstackinfo->si_next; 557 PL_curstackinfo = PL_curstackinfo->si_next;
542 558
543 while (PL_curstackinfo) 559 while (PL_curstackinfo)
544 { 560 {
545 PERL_SI *p = PL_curstackinfo->si_prev; 561 PERL_SI *p = PL_curstackinfo->si_prev;
546 562
547 { 563 { /*D*//*remove*/
548 dSP; 564 dSP;
549 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 565 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
550 PUTBACK; /* possibly superfluous */ 566 PUTBACK; /* possibly superfluous */
551 } 567 }
552 568
553 if (!IN_DESTRUCT) 569 if (!IN_DESTRUCT)
554 { 570 {
555 dounwind(-1); 571 dounwind (-1);/*D*//*remove*/
556 SvREFCNT_dec(PL_curstackinfo->si_stack); 572 SvREFCNT_dec (PL_curstackinfo->si_stack);
557 } 573 }
558 574
559 Safefree(PL_curstackinfo->si_cxstack); 575 Safefree (PL_curstackinfo->si_cxstack);
560 Safefree(PL_curstackinfo); 576 Safefree (PL_curstackinfo);
561 PL_curstackinfo = p; 577 PL_curstackinfo = p;
562 } 578 }
563 579
564 Safefree(PL_tmps_stack); 580 Safefree (PL_tmps_stack);
565 Safefree(PL_markstack); 581 Safefree (PL_markstack);
566 Safefree(PL_scopestack); 582 Safefree (PL_scopestack);
567 Safefree(PL_savestack); 583 Safefree (PL_savestack);
584#ifdef PL_retstack
568 Safefree(PL_retstack); 585 Safefree (PL_retstack);
586#endif
569} 587}
570 588
571static void 589static void
572allocate_stack (Coro__State ctx, int alloc) 590allocate_stack (Coro__State ctx, int alloc)
573{ 591{
576 New (0, stack, 1, coro_stack); 594 New (0, stack, 1, coro_stack);
577 595
578 stack->refcnt = 1; 596 stack->refcnt = 1;
579 stack->usecnt = 1; 597 stack->usecnt = 1;
580 stack->gencnt = ctx->gencnt = 0; 598 stack->gencnt = ctx->gencnt = 0;
599
581 if (alloc) 600 if (alloc)
582 { 601 {
583#if HAVE_MMAP 602#if HAVE_MMAP
584 stack->ssize = 128 * 1024 * sizeof (long); /* mmap should do allocate-on-write for us */ 603 stack->ssize = STACKSIZE * sizeof (long); /* mmap should do allocate-on-write for us */
585 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 604 stack->sptr = mmap (0, stack->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
586 if (stack->sptr == (void *)-1) 605 if (stack->sptr == (void *)-1)
587#endif 606#endif
588 { 607 {
589 /*FIXME*//*D*//* reasonable stack size! */ 608 /*FIXME*//*D*//* reasonable stack size! */
590 stack->ssize = -4096 * sizeof (long); 609 stack->ssize = - (STACKSIZE * sizeof (long));
591 New (0, stack->sptr, 4096, long); 610 New (0, stack->sptr, STACKSIZE, long);
592 } 611 }
593 } 612 }
594 else 613 else
595 stack->sptr = 0; 614 stack->sptr = 0;
596 615
626setup_coro (void *arg) 645setup_coro (void *arg)
627{ 646{
628 /* 647 /*
629 * emulate part of the perl startup here. 648 * emulate part of the perl startup here.
630 */ 649 */
650 dTHX;
631 dSP; 651 dSP;
632 Coro__State ctx = (Coro__State)arg; 652 Coro__State ctx = (Coro__State)arg;
633 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 653 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
634 654
635 coro_init_stacks (aTHX); 655 coro_init_stacks (aTHX);
636 /*PL_curcop = 0;*/ 656 /*PL_curcop = 0;*/
637 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 657 /*PL_in_eval = PL_in_eval;*/ /* inherit */
638 SvREFCNT_dec (GvAV (PL_defgv)); 658 SvREFCNT_dec (GvAV (PL_defgv));
684continue_coro (void *arg) 704continue_coro (void *arg)
685{ 705{
686 /* 706 /*
687 * this is a _very_ stripped down perl interpreter ;) 707 * this is a _very_ stripped down perl interpreter ;)
688 */ 708 */
709 dTHX;
689 Coro__State ctx = (Coro__State)arg; 710 Coro__State ctx = (Coro__State)arg;
690 JMPENV coro_start_env; 711 JMPENV coro_start_env;
691 712
692 PL_top_env = &ctx->start_env; 713 PL_top_env = &ctx->start_env;
693 714
697 718
698 abort (); 719 abort ();
699} 720}
700 721
701STATIC void 722STATIC void
702transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 723transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
703{ 724{
704 dSTACKLEVEL; 725 dSTACKLEVEL;
705 static struct coro *xnext;
706 726
707 if (prev != next) 727 if (prev != next)
708 { 728 {
709 xnext = next;
710
711 if (next->mainstack) 729 if (next->mainstack)
712 { 730 {
731 LOCK;
713 SAVE (prev, flags); 732 SAVE (prev, flags);
714 LOAD (next); 733 LOAD (next);
734 UNLOCK;
715 735
716 /* mark this state as in-use */ 736 /* mark this state as in-use */
717 next->mainstack = 0; 737 next->mainstack = 0;
718 next->tmps_ix = -2; 738 next->tmps_ix = -2;
719 739
738 continue_coro, (void *)next, 758 continue_coro, (void *)next,
739 next->stack->sptr, labs (next->stack->ssize)); 759 next->stack->sptr, labs (next->stack->ssize));
740 } 760 }
741 761
742 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 762 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
763 prev->cursp = stacklevel;
743 /* don't add any code here */ 764 /* don't add any code here */
744 } 765 }
745 766 else
767 next->cursp = stacklevel;
746 } 768 }
747 else if (next->tmps_ix == -2) 769 else if (next->tmps_ix == -2)
748 croak ("tried to transfer to running coroutine"); 770 croak ("tried to transfer to running coroutine");
749 else 771 else
750 { 772 {
773 LOCK;
751 SAVE (prev, -1); /* first get rid of the old state */ 774 SAVE (prev, -1); /* first get rid of the old state */
775 UNLOCK;
752 776
753 if (flags & TRANSFER_SAVE_CCTXT) 777 if (flags & TRANSFER_SAVE_CCTXT)
754 { 778 {
755 if (!prev->stack) 779 if (!prev->stack)
756 allocate_stack (prev, 0); 780 allocate_stack (prev, 0);
758 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 782 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
759 { 783 {
760 PL_top_env = &next->start_env; 784 PL_top_env = &next->start_env;
761 785
762 setup_coro (next); 786 setup_coro (next);
787 next->cursp = stacklevel;
763 788
764 prev->stack->refcnt++; 789 prev->stack->refcnt++;
765 prev->stack->usecnt++; 790 prev->stack->usecnt++;
766 next->stack = prev->stack; 791 next->stack = prev->stack;
767 next->gencnt = prev->gencnt; 792 next->gencnt = prev->gencnt;
772 allocate_stack (next, 1); 797 allocate_stack (next, 1);
773 coro_create (&(next->stack->cctx), 798 coro_create (&(next->stack->cctx),
774 setup_coro, (void *)next, 799 setup_coro, (void *)next,
775 next->stack->sptr, labs (next->stack->ssize)); 800 next->stack->sptr, labs (next->stack->ssize));
776 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 801 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
802 prev->cursp = stacklevel;
777 /* don't add any code here */ 803 /* don't add any code here */
778 } 804 }
779 } 805 }
780 else 806 else
807 {
781 setup_coro (next); 808 setup_coro (next);
809 next->cursp = stacklevel;
810 }
782 } 811 }
783
784 /*
785 * xnext is now either prev or next, depending on wether
786 * we switched the c stack or not. that's why I use a global
787 * variable, that should become thread-specific at one point.
788 */
789 xnext->cursp = stacklevel;
790 } 812 }
791 813
814 LOCK;
792 if (coro_mortal) 815 if (coro_mortal)
793 { 816 {
794 SvREFCNT_dec (coro_mortal); 817 SvREFCNT_dec (coro_mortal);
795 coro_mortal = 0; 818 coro_mortal = 0;
796 } 819 }
820 UNLOCK;
797} 821}
798 822
799#define SV_CORO(sv,func) \ 823#define SV_CORO(sv,func) \
800 do { \ 824 do { \
801 if (SvROK (sv)) \ 825 if (SvROK (sv)) \
802 sv = SvRV (sv); \ 826 sv = SvRV (sv); \
803 \ 827 \
804 if (SvTYPE(sv) == SVt_PVHV) \ 828 if (SvTYPE (sv) == SVt_PVHV) \
805 { \ 829 { \
806 HE *he = hv_fetch_ent((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \ 830 HE *he = hv_fetch_ent ((HV *)sv, ucoro_state_sv, 0, ucoro_state_hash); \
807 \ 831 \
808 if (!he) \ 832 if (!he) \
809 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \ 833 croak ("%s() -- %s is a hashref but lacks the " UCORO_STATE " key", func, # sv); \
810 \ 834 \
811 (sv) = SvRV (HeVAL(he)); \ 835 (sv) = SvRV (HeVAL(he)); \
812 } \ 836 } \
813 \ 837 \
814 /* must also be changed inside Coro::Cont::yield */ \ 838 /* must also be changed inside Coro::Cont::yield */ \
815 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \ 839 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
816 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \ 840 croak ("%s() -- %s is not (and contains not) a Coro::State object", func, # sv); \
817 \ 841 \
818 } while(0) 842 } while(0)
819 843
820#define SvSTATE(sv) (struct coro *)SvIV (sv) 844#define SvSTATE(sv) (struct coro *)SvIV (sv)
823api_transfer(pTHX_ SV *prev, SV *next, int flags) 847api_transfer(pTHX_ SV *prev, SV *next, int flags)
824{ 848{
825 SV_CORO (prev, "Coro::transfer"); 849 SV_CORO (prev, "Coro::transfer");
826 SV_CORO (next, "Coro::transfer"); 850 SV_CORO (next, "Coro::transfer");
827 851
828 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags); 852 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
829} 853}
830 854
831/** Coro ********************************************************************/ 855/** Coro ********************************************************************/
832 856
833#define PRIO_MAX 3 857#define PRIO_MAX 3
841static GV *coro_current, *coro_idle; 865static GV *coro_current, *coro_idle;
842static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 866static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
843static int coro_nready; 867static int coro_nready;
844 868
845static void 869static void
846coro_enq (SV *sv) 870coro_enq (pTHX_ SV *sv)
847{ 871{
848 if (SvTYPE (sv) == SVt_PVHV) 872 if (SvTYPE (sv) == SVt_PVHV)
849 { 873 {
850 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0); 874 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
851 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL; 875 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
862 886
863 croak ("Coro::ready tried to enqueue something that is not a coroutine"); 887 croak ("Coro::ready tried to enqueue something that is not a coroutine");
864} 888}
865 889
866static SV * 890static SV *
867coro_deq (int min_prio) 891coro_deq (pTHX_ int min_prio)
868{ 892{
869 int prio = PRIO_MAX - PRIO_MIN; 893 int prio = PRIO_MAX - PRIO_MIN;
870 894
871 min_prio -= PRIO_MIN; 895 min_prio -= PRIO_MIN;
872 if (min_prio < 0) 896 if (min_prio < 0)
883} 907}
884 908
885static void 909static void
886api_ready (SV *coro) 910api_ready (SV *coro)
887{ 911{
912 dTHX;
913
888 if (SvROK (coro)) 914 if (SvROK (coro))
889 coro = SvRV (coro); 915 coro = SvRV (coro);
890 916
917 LOCK;
891 coro_enq (SvREFCNT_inc (coro)); 918 coro_enq (aTHX_ SvREFCNT_inc (coro));
919 UNLOCK;
892} 920}
893 921
894static void 922static void
895api_schedule (void) 923api_schedule (void)
896{ 924{
925 dTHX;
926
897 SV *prev, *next; 927 SV *prev, *next;
898 928
929 LOCK;
930
899 prev = SvRV (GvSV (coro_current)); 931 prev = SvRV (GvSV (coro_current));
900 next = coro_deq (PRIO_MIN); 932 next = coro_deq (aTHX_ PRIO_MIN);
901 933
902 if (!next) 934 if (!next)
903 next = SvREFCNT_inc (SvRV (GvSV (coro_idle))); 935 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
904 936
905 /* free this only after the transfer */ 937 /* free this only after the transfer */
908 940
909 SvRV (GvSV (coro_current)) = next; 941 SvRV (GvSV (coro_current)) = next;
910 942
911 SV_CORO (next, "Coro::schedule"); 943 SV_CORO (next, "Coro::schedule");
912 944
945 UNLOCK;
946
913 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), 947 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
914 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 948 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
915} 949}
916 950
917static void 951static void
918api_cede (void) 952api_cede (void)
919{ 953{
954 dTHX;
955
956 LOCK;
920 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current)))); 957 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
958 UNLOCK;
921 959
922 api_schedule (); 960 api_schedule ();
923} 961}
924 962
925MODULE = Coro::State PACKAGE = Coro::State 963MODULE = Coro::State PACKAGE = Coro::State
926 964
927PROTOTYPES: ENABLE 965PROTOTYPES: ENABLE
928 966
929BOOT: 967BOOT:
930{ /* {} necessary for stoopid perl-5.6.x */ 968{ /* {} necessary for stoopid perl-5.6.x */
969#ifdef USE_ITHREADS
970 MUTEX_INIT (&coro_mutex);
971#endif
972
931 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 973 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
932 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 974 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
933 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 975 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
934 976
935 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 977 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
936 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 978 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
937 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 979 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
938 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT)); 980 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
939
940 if (!padlist_cache)
941 padlist_cache = newHV ();
942 981
943 main_mainstack = PL_mainstack; 982 main_mainstack = PL_mainstack;
944 983
945 coroapi.ver = CORO_API_VERSION; 984 coroapi.ver = CORO_API_VERSION;
946 coroapi.transfer = api_transfer; 985 coroapi.transfer = api_transfer;
957 croak ("Coro::State::_newprocess expects an arrayref"); 996 croak ("Coro::State::_newprocess expects an arrayref");
958 997
959 Newz (0, coro, 1, struct coro); 998 Newz (0, coro, 1, struct coro);
960 999
961 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 1000 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
962 coro->mainstack = 0; /* actual work is done inside transfer */ 1001 /*coro->mainstack = 0; *//*actual work is done inside transfer */
963 coro->stack = 0; 1002 /*coro->stack = 0;*/
964 1003
965 /* same as JMPENV_BOOTSTRAP */ 1004 /* same as JMPENV_BOOTSTRAP */
966 /* we might be able to recycle start_env, but safe is safe */ 1005 /* we might be able to recycle start_env, but safe is safe */
967 //Zero(&coro->start_env, 1, JMPENV); 1006 /*Zero(&coro->start_env, 1, JMPENV);*/
968 coro->start_env.je_ret = -1; 1007 coro->start_env.je_ret = -1;
969 coro->start_env.je_mustcatch = TRUE; 1008 coro->start_env.je_mustcatch = TRUE;
970 1009
971 RETVAL = coro; 1010 RETVAL = coro;
972 OUTPUT: 1011 OUTPUT:
993 if (coro->mainstack && coro->mainstack != main_mainstack) 1032 if (coro->mainstack && coro->mainstack != main_mainstack)
994 { 1033 {
995 struct coro temp; 1034 struct coro temp;
996 1035
997 PUTBACK; 1036 PUTBACK;
998 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 1037 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
999 LOAD(aTHX_ coro); 1038 LOAD (aTHX_ coro);
1000 SPAGAIN; 1039 SPAGAIN;
1001 1040
1002 destroy_stacks (aTHX); 1041 destroy_stacks (aTHX);
1003 1042
1004 LOAD((&temp)); /* this will get rid of defsv etc.. */ 1043 LOAD ((&temp)); /* this will get rid of defsv etc.. */
1005 SPAGAIN; 1044 SPAGAIN;
1006 1045
1007 coro->mainstack = 0; 1046 coro->mainstack = 0;
1008 } 1047 }
1009 1048
1010 deallocate_stack (coro); 1049 deallocate_stack (coro);
1011 SvREFCNT_dec (coro->args); 1050 SvREFCNT_dec (coro->args);
1012 Safefree (coro); 1051 Safefree (coro);
1013
1014void
1015flush()
1016 CODE:
1017#ifdef MAY_FLUSH
1018 flush_padlist_cache ();
1019#endif
1020 1052
1021void 1053void
1022_exit(code) 1054_exit(code)
1023 int code 1055 int code
1024 PROTOTYPE: $ 1056 PROTOTYPE: $
1025 CODE: 1057 CODE:
1026#if defined(__GLIBC__) || _POSIX_C_SOURCE
1027 _exit (code); 1058 _exit (code);
1028#else
1029 signal (SIGTERM, SIG_DFL);
1030 raise (SIGTERM);
1031 exit (code);
1032#endif
1033 1059
1034MODULE = Coro::State PACKAGE = Coro::Cont 1060MODULE = Coro::State PACKAGE = Coro::Cont
1035 1061
1036# this is slightly dirty (should expose a c-level api) 1062# this is slightly dirty (should expose a c-level api)
1037 1063
1038void 1064void
1039yield(...) 1065yield(...)
1040 PROTOTYPE: @ 1066 PROTOTYPE: @
1041 CODE: 1067 CODE:
1042 static SV *returnstk; 1068 SV *yieldstack;
1043 SV *sv; 1069 SV *sv;
1044 AV *defav = GvAV (PL_defgv); 1070 AV *defav = GvAV (PL_defgv);
1045 struct coro *prev, *next; 1071 struct coro *prev, *next;
1046 1072
1047 if (!returnstk) 1073 yieldstack = *hv_fetch (
1048 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE)); 1074 (HV *)SvRV (GvSV (coro_current)),
1075 "yieldstack", sizeof ("yieldstack") - 1,
1076 0
1077 );
1049 1078
1050 /* set up @_ -- ugly */ 1079 /* set up @_ -- ugly */
1051 av_clear (defav); 1080 av_clear (defav);
1052 av_fill (defav, items - 1); 1081 av_fill (defav, items - 1);
1053 while (items--) 1082 while (items--)
1054 av_store (defav, items, SvREFCNT_inc (ST(items))); 1083 av_store (defav, items, SvREFCNT_inc (ST(items)));
1055 1084
1056 mg_get (returnstk); /* isn't documentation wrong for mg_get? */
1057 sv = av_pop ((AV *)SvRV (returnstk)); 1085 sv = av_pop ((AV *)SvRV (yieldstack));
1058 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0))); 1086 prev = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 0, 0)));
1059 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0))); 1087 next = (struct coro *)SvIV ((SV*)SvRV (*av_fetch ((AV *)SvRV (sv), 1, 0)));
1060 SvREFCNT_dec (sv); 1088 SvREFCNT_dec (sv);
1061 1089
1062 transfer(aTHX_ prev, next, 0); 1090 transfer (aTHX_ prev, next, 0);
1063 1091
1064MODULE = Coro::State PACKAGE = Coro 1092MODULE = Coro::State PACKAGE = Coro
1065 1093
1066# this is slightly dirty (should expose a c-level api) 1094# this is slightly dirty (should expose a c-level api)
1067 1095
1096 sv_setiv(sv, (IV)&coroapi); 1124 sv_setiv(sv, (IV)&coroapi);
1097 SvREADONLY_on(sv); 1125 SvREADONLY_on(sv);
1098 } 1126 }
1099} 1127}
1100 1128
1129#if !PERL_MICRO
1130
1101void 1131void
1102ready(self) 1132ready(self)
1103 SV * self 1133 SV * self
1104 PROTOTYPE: $ 1134 PROTOTYPE: $
1105 CODE: 1135 CODE:
1106 api_ready (self); 1136 api_ready (self);
1137
1138#endif
1107 1139
1108int 1140int
1109nready(...) 1141nready(...)
1110 PROTOTYPE: 1142 PROTOTYPE:
1111 CODE: 1143 CODE:
1123cede(...) 1155cede(...)
1124 PROTOTYPE: 1156 PROTOTYPE:
1125 CODE: 1157 CODE:
1126 api_cede (); 1158 api_cede ();
1127 1159
1160# and these are hacks
1161SV *
1162_aio_get_state ()
1163 CODE:
1164{
1165 struct {
1166 int errorno;
1167 int laststype;
1168 int laststatval;
1169 Stat_t statcache;
1170 } data;
1171
1172 data.errorno = errno;
1173 data.laststype = PL_laststype;
1174 data.laststatval = PL_laststatval;
1175 data.statcache = PL_statcache;
1176
1177 RETVAL = newSVpvn ((char *)&data, sizeof data);
1178}
1179 OUTPUT:
1180 RETVAL
1181
1182void
1183_aio_set_state (char *data_)
1184 PROTOTYPE: $
1185 CODE:
1186{
1187 struct {
1188 int errorno;
1189 int laststype;
1190 int laststatval;
1191 Stat_t statcache;
1192 } *data = (void *)data_;
1193
1194 errno = data->errorno;
1195 PL_laststype = data->laststype;
1196 PL_laststatval = data->laststatval;
1197 PL_statcache = data->statcache;
1198}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines