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.48 by pcg, Sat Nov 15 03:53:37 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
202#ifdef SvPADBUSY
189 if (!SvPADBUSY (sv)) 203 if (!SvPADBUSY (sv))
204#endif
190 SvPADMY_on (sv); 205 SvPADMY_on (sv);
206
191 npad[ix] = sv; 207 npad[ix] = sv;
192 } 208 }
193 } 209 }
194 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix])) 210 else if (IS_PADGV (ppad[ix]) || IS_PADCONST (ppad[ix]))
195 { 211 {
224#endif 240#endif
225 241
226 return newpadlist; 242 return newpadlist;
227} 243}
228 244
229#ifdef MAY_FLUSH
230STATIC void 245STATIC void
231free_padlist (AV *padlist) 246free_padlist (pTHX_ AV *padlist)
232{ 247{
233 /* may be during global destruction */ 248 /* may be during global destruction */
234 if (SvREFCNT(padlist)) 249 if (SvREFCNT (padlist))
235 { 250 {
236 I32 i = AvFILLp(padlist); 251 I32 i = AvFILLp (padlist);
237 while (i >= 0) 252 while (i >= 0)
238 { 253 {
239 SV **svp = av_fetch(padlist, i--, FALSE); 254 SV **svp = av_fetch (padlist, i--, FALSE);
240 SV *sv = svp ? *svp : Nullsv;
241 if (sv) 255 if (svp)
256 {
257 SV *sv;
258 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp)))
242 SvREFCNT_dec(sv); 259 SvREFCNT_dec (sv);
260
261 SvREFCNT_dec (*svp);
262 }
243 } 263 }
244 264
245 SvREFCNT_dec((SV*)padlist); 265 SvREFCNT_dec ((SV*)padlist);
246 } 266 }
247} 267}
248#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};
249 285
250/* the next two functions merely cache the padlists */ 286/* the next two functions merely cache the padlists */
251STATIC void 287STATIC void
252get_padlist (CV *cv) 288get_padlist (pTHX_ CV *cv)
253{ 289{
254 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 0); 290 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
255 291
256 if (he && AvFILLp ((AV *)*he) >= 0) 292 if (mg && AvFILLp ((AV *)mg->mg_obj) >= 0)
257 CvPADLIST (cv) = (AV *)av_pop ((AV *)*he); 293 CvPADLIST (cv) = (AV *)av_pop ((AV *)mg->mg_obj);
258 else 294 else
259 CvPADLIST (cv) = clone_padlist (CvPADLIST (cv)); 295 CvPADLIST (cv) = clone_padlist (aTHX_ CvPADLIST (cv));
260} 296}
261 297
262STATIC void 298STATIC void
263put_padlist (CV *cv) 299put_padlist (pTHX_ CV *cv)
264{ 300{
265 SV **he = hv_fetch (padlist_cache, (void *)&cv, sizeof (CV *), 1); 301 MAGIC *mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
266 302
267 if (SvTYPE (*he) != SVt_PVAV) 303 if (!mg)
268 { 304 {
269 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;
270 *he = (SV *)newAV (); 308 mg->mg_obj = (SV *)newAV ();
271 } 309 }
272 310
273 av_push ((AV *)*he, (SV *)CvPADLIST (cv)); 311 av_push ((AV *)mg->mg_obj, (SV *)CvPADLIST (cv));
274} 312}
275
276#ifdef MAY_FLUSH
277STATIC void
278flush_padlist_cache ()
279{
280 HV *hv = padlist_cache;
281 padlist_cache = newHV ();
282
283 if (hv_iterinit (hv))
284 {
285 HE *he;
286 AV *padlist;
287
288 while (!!(he = hv_iternext (hv)))
289 {
290 AV *av = (AV *)HeVAL(he);
291
292 /* casting is fun. */
293 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
294 free_padlist (padlist);
295 }
296 }
297
298 SvREFCNT_dec (hv);
299}
300#endif
301 313
302#define SB do { 314#define SB do {
303#define SE } while (0) 315#define SE } while (0)
304 316
305#define LOAD(state) load_state(aTHX_ (state)); 317#define LOAD(state) load_state(aTHX_ (state));
318 PL_mainstack = c->mainstack; 330 PL_mainstack = c->mainstack;
319 PL_stack_sp = c->stack_sp; 331 PL_stack_sp = c->stack_sp;
320 PL_op = c->op; 332 PL_op = c->op;
321 PL_curpad = c->curpad; 333 PL_curpad = c->curpad;
322 PL_comppad = c->comppad; 334 PL_comppad = c->comppad;
335 PL_compcv = c->compcv;
323 PL_stack_base = c->stack_base; 336 PL_stack_base = c->stack_base;
324 PL_stack_max = c->stack_max; 337 PL_stack_max = c->stack_max;
325 PL_tmps_stack = c->tmps_stack; 338 PL_tmps_stack = c->tmps_stack;
326 PL_tmps_floor = c->tmps_floor; 339 PL_tmps_floor = c->tmps_floor;
327 PL_tmps_ix = c->tmps_ix; 340 PL_tmps_ix = c->tmps_ix;
333 PL_scopestack_ix = c->scopestack_ix; 346 PL_scopestack_ix = c->scopestack_ix;
334 PL_scopestack_max = c->scopestack_max; 347 PL_scopestack_max = c->scopestack_max;
335 PL_savestack = c->savestack; 348 PL_savestack = c->savestack;
336 PL_savestack_ix = c->savestack_ix; 349 PL_savestack_ix = c->savestack_ix;
337 PL_savestack_max = c->savestack_max; 350 PL_savestack_max = c->savestack_max;
351#ifdef PL_retstack
338 PL_retstack = c->retstack; 352 PL_retstack = c->retstack;
339 PL_retstack_ix = c->retstack_ix; 353 PL_retstack_ix = c->retstack_ix;
340 PL_retstack_max = c->retstack_max; 354 PL_retstack_max = c->retstack_max;
355#endif
356 PL_curpm = c->curpm;
341 PL_curcop = c->curcop; 357 PL_curcop = c->curcop;
342 PL_top_env = c->top_env; 358 PL_top_env = c->top_env;
343 359
344 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 360 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
345 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 361 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
354 { 370 {
355 AV *padlist = (AV *)POPs; 371 AV *padlist = (AV *)POPs;
356 372
357 if (padlist) 373 if (padlist)
358 { 374 {
359 put_padlist (cv); /* mark this padlist as available */ 375 put_padlist (aTHX_ cv); /* mark this padlist as available */
360 CvPADLIST(cv) = padlist; 376 CvPADLIST(cv) = padlist;
361#ifdef USE_THREADS
362 /*CvOWNER(cv) = (struct perl_thread *)POPs;*/
363#endif
364 } 377 }
365 378
366 ++CvDEPTH(cv); 379 ++CvDEPTH(cv);
367 } 380 }
368 381
395 if (CxTYPE(cx) == CXt_SUB) 408 if (CxTYPE(cx) == CXt_SUB)
396 { 409 {
397 CV *cv = cx->blk_sub.cv; 410 CV *cv = cx->blk_sub.cv;
398 if (CvDEPTH(cv)) 411 if (CvDEPTH(cv))
399 { 412 {
400#ifdef USE_THREADS
401 /*XPUSHs ((SV *)CvOWNER(cv));*/
402 /*CvOWNER(cv) = 0;*/
403 /*error must unlock this cv etc.. etc...*/
404#endif
405 EXTEND (SP, CvDEPTH(cv)*2); 413 EXTEND (SP, CvDEPTH(cv)*2);
406 414
407 while (--CvDEPTH(cv)) 415 while (--CvDEPTH(cv))
408 { 416 {
409 /* this tells the restore code to increment CvDEPTH */ 417 /* this tells the restore code to increment CvDEPTH */
412 } 420 }
413 421
414 PUSHs ((SV *)CvPADLIST(cv)); 422 PUSHs ((SV *)CvPADLIST(cv));
415 PUSHs ((SV *)cv); 423 PUSHs ((SV *)cv);
416 424
417 get_padlist (cv); /* this is a monster */ 425 get_padlist (aTHX_ cv); /* this is a monster */
418 } 426 }
419 } 427 }
420#ifdef CXt_FORMAT 428#ifdef CXt_FORMAT
421 else if (CxTYPE(cx) == CXt_FORMAT) 429 else if (CxTYPE(cx) == CXt_FORMAT)
422 { 430 {
450 c->mainstack = PL_mainstack; 458 c->mainstack = PL_mainstack;
451 c->stack_sp = PL_stack_sp; 459 c->stack_sp = PL_stack_sp;
452 c->op = PL_op; 460 c->op = PL_op;
453 c->curpad = PL_curpad; 461 c->curpad = PL_curpad;
454 c->comppad = PL_comppad; 462 c->comppad = PL_comppad;
463 c->compcv = PL_compcv;
455 c->stack_base = PL_stack_base; 464 c->stack_base = PL_stack_base;
456 c->stack_max = PL_stack_max; 465 c->stack_max = PL_stack_max;
457 c->tmps_stack = PL_tmps_stack; 466 c->tmps_stack = PL_tmps_stack;
458 c->tmps_floor = PL_tmps_floor; 467 c->tmps_floor = PL_tmps_floor;
459 c->tmps_ix = PL_tmps_ix; 468 c->tmps_ix = PL_tmps_ix;
465 c->scopestack_ix = PL_scopestack_ix; 474 c->scopestack_ix = PL_scopestack_ix;
466 c->scopestack_max = PL_scopestack_max; 475 c->scopestack_max = PL_scopestack_max;
467 c->savestack = PL_savestack; 476 c->savestack = PL_savestack;
468 c->savestack_ix = PL_savestack_ix; 477 c->savestack_ix = PL_savestack_ix;
469 c->savestack_max = PL_savestack_max; 478 c->savestack_max = PL_savestack_max;
479#ifdef PL_retstack
470 c->retstack = PL_retstack; 480 c->retstack = PL_retstack;
471 c->retstack_ix = PL_retstack_ix; 481 c->retstack_ix = PL_retstack_ix;
472 c->retstack_max = PL_retstack_max; 482 c->retstack_max = PL_retstack_max;
483#endif
484 c->curpm = PL_curpm;
473 c->curcop = PL_curcop; 485 c->curcop = PL_curcop;
474 c->top_env = PL_top_env; 486 c->top_env = PL_top_env;
475} 487}
476 488
477/* 489/*
478 * allocate various perl stacks. This is an exact copy 490 * allocate various perl stacks. This is an exact copy
479 * of perl.c:init_stacks, except that it uses less memory 491 * of perl.c:init_stacks, except that it uses less memory
480 * on the assumption that coroutines do not usually need 492 * on the (sometimes correct) assumption that coroutines do
481 * a lot of stackspace. 493 * not usually need a lot of stackspace.
482 */ 494 */
483STATIC void 495STATIC void
484coro_init_stacks (pTHX) 496coro_init_stacks (pTHX)
485{ 497{
498 LOCK;
499
486 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1); 500 PL_curstackinfo = new_stackinfo(96, 1024/sizeof(PERL_CONTEXT) - 1);
487 PL_curstackinfo->si_type = PERLSI_MAIN; 501 PL_curstackinfo->si_type = PERLSI_MAIN;
488 PL_curstack = PL_curstackinfo->si_stack; 502 PL_curstack = PL_curstackinfo->si_stack;
489 PL_mainstack = PL_curstack; /* remember in case we switch stacks */ 503 PL_mainstack = PL_curstack; /* remember in case we switch stacks */
490 504
511 525
512 New(54,PL_savestack,96,ANY); 526 New(54,PL_savestack,96,ANY);
513 PL_savestack_ix = 0; 527 PL_savestack_ix = 0;
514 PL_savestack_max = 96; 528 PL_savestack_max = 96;
515 529
530#ifdef PL_retstack
516 New(54,PL_retstack,8,OP*); 531 New(54,PL_retstack,8,OP*);
517 PL_retstack_ix = 0; 532 PL_retstack_ix = 0;
518 PL_retstack_max = 8; 533 PL_retstack_max = 8;
534#endif
535
536 UNLOCK;
519} 537}
520 538
521/* 539/*
522 * destroy the stacks, the callchain etc... 540 * destroy the stacks, the callchain etc...
523 */ 541 */
525destroy_stacks(pTHX) 543destroy_stacks(pTHX)
526{ 544{
527 if (!IN_DESTRUCT) 545 if (!IN_DESTRUCT)
528 { 546 {
529 /* is this ugly, I ask? */ 547 /* is this ugly, I ask? */
530 while (PL_scopestack_ix) 548 LEAVE_SCOPE (0);
531 LEAVE;
532 549
533 /* sure it is, but more important: is it correct?? :/ */ 550 /* sure it is, but more important: is it correct?? :/ */
534 while (PL_tmps_ix > PL_tmps_floor) /* should only ever be one iteration */
535 FREETMPS; 551 FREETMPS;
552
553 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/
536 } 554 }
537 555
538 while (PL_curstackinfo->si_next) 556 while (PL_curstackinfo->si_next)
539 PL_curstackinfo = PL_curstackinfo->si_next; 557 PL_curstackinfo = PL_curstackinfo->si_next;
540 558
541 while (PL_curstackinfo) 559 while (PL_curstackinfo)
542 { 560 {
543 PERL_SI *p = PL_curstackinfo->si_prev; 561 PERL_SI *p = PL_curstackinfo->si_prev;
544 562
545 { 563 { /*D*//*remove*/
546 dSP; 564 dSP;
547 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 565 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
548 PUTBACK; /* possibly superfluous */ 566 PUTBACK; /* possibly superfluous */
549 } 567 }
550 568
551 if (!IN_DESTRUCT) 569 if (!IN_DESTRUCT)
552 { 570 {
553 dounwind(-1); 571 dounwind (-1);/*D*//*remove*/
554 SvREFCNT_dec(PL_curstackinfo->si_stack); 572 SvREFCNT_dec (PL_curstackinfo->si_stack);
555 } 573 }
556 574
557 Safefree(PL_curstackinfo->si_cxstack); 575 Safefree (PL_curstackinfo->si_cxstack);
558 Safefree(PL_curstackinfo); 576 Safefree (PL_curstackinfo);
559 PL_curstackinfo = p; 577 PL_curstackinfo = p;
560 } 578 }
561 579
562 Safefree(PL_tmps_stack); 580 Safefree (PL_tmps_stack);
563 Safefree(PL_markstack); 581 Safefree (PL_markstack);
564 Safefree(PL_scopestack); 582 Safefree (PL_scopestack);
565 Safefree(PL_savestack); 583 Safefree (PL_savestack);
584#ifdef PL_retstack
566 Safefree(PL_retstack); 585 Safefree (PL_retstack);
586#endif
567} 587}
568 588
569static void 589static void
570allocate_stack (Coro__State ctx, int alloc) 590allocate_stack (Coro__State ctx, int alloc)
571{ 591{
574 New (0, stack, 1, coro_stack); 594 New (0, stack, 1, coro_stack);
575 595
576 stack->refcnt = 1; 596 stack->refcnt = 1;
577 stack->usecnt = 1; 597 stack->usecnt = 1;
578 stack->gencnt = ctx->gencnt = 0; 598 stack->gencnt = ctx->gencnt = 0;
599
579 if (alloc) 600 if (alloc)
580 { 601 {
581#if HAVE_MMAP 602#if HAVE_MMAP
582 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 */
583 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);
584 if (stack->sptr == (void *)-1) 605 if (stack->sptr == (void *)-1)
585#endif 606#endif
586 { 607 {
587 /*FIXME*//*D*//* reasonable stack size! */ 608 /*FIXME*//*D*//* reasonable stack size! */
588 stack->ssize = -4096 * sizeof (long); 609 stack->ssize = - (STACKSIZE * sizeof (long));
589 New (0, stack->sptr, 4096, long); 610 New (0, stack->sptr, STACKSIZE, long);
590 } 611 }
591 } 612 }
592 else 613 else
593 stack->sptr = 0; 614 stack->sptr = 0;
594 615
624setup_coro (void *arg) 645setup_coro (void *arg)
625{ 646{
626 /* 647 /*
627 * emulate part of the perl startup here. 648 * emulate part of the perl startup here.
628 */ 649 */
650 dTHX;
629 dSP; 651 dSP;
630 Coro__State ctx = (Coro__State)arg; 652 Coro__State ctx = (Coro__State)arg;
631 SV *sub_init = (SV*)get_cv(SUB_INIT, FALSE); 653 SV *sub_init = (SV *)get_cv (SUB_INIT, FALSE);
632 654
633 coro_init_stacks (aTHX); 655 coro_init_stacks (aTHX);
634 /*PL_curcop = 0;*/ 656 /*PL_curcop = 0;*/
635 /*PL_in_eval = PL_in_eval;*/ /* inherit */ 657 /*PL_in_eval = PL_in_eval;*/ /* inherit */
636 SvREFCNT_dec (GvAV (PL_defgv)); 658 SvREFCNT_dec (GvAV (PL_defgv));
682continue_coro (void *arg) 704continue_coro (void *arg)
683{ 705{
684 /* 706 /*
685 * this is a _very_ stripped down perl interpreter ;) 707 * this is a _very_ stripped down perl interpreter ;)
686 */ 708 */
709 dTHX;
687 Coro__State ctx = (Coro__State)arg; 710 Coro__State ctx = (Coro__State)arg;
688 JMPENV coro_start_env; 711 JMPENV coro_start_env;
689 712
690 PL_top_env = &ctx->start_env; 713 PL_top_env = &ctx->start_env;
691 714
695 718
696 abort (); 719 abort ();
697} 720}
698 721
699STATIC void 722STATIC void
700transfer(pTHX_ struct coro *prev, struct coro *next, int flags) 723transfer (pTHX_ struct coro *prev, struct coro *next, int flags)
701{ 724{
702 dSTACKLEVEL; 725 dSTACKLEVEL;
703 static struct coro *xnext;
704 726
705 if (prev != next) 727 if (prev != next)
706 { 728 {
707 xnext = next;
708
709 if (next->mainstack) 729 if (next->mainstack)
710 { 730 {
731 LOCK;
711 SAVE (prev, flags); 732 SAVE (prev, flags);
712 LOAD (next); 733 LOAD (next);
734 UNLOCK;
713 735
714 /* mark this state as in-use */ 736 /* mark this state as in-use */
715 next->mainstack = 0; 737 next->mainstack = 0;
716 next->tmps_ix = -2; 738 next->tmps_ix = -2;
717 739
736 continue_coro, (void *)next, 758 continue_coro, (void *)next,
737 next->stack->sptr, labs (next->stack->ssize)); 759 next->stack->sptr, labs (next->stack->ssize));
738 } 760 }
739 761
740 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 762 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
763 prev->cursp = stacklevel;
741 /* don't add any code here */ 764 /* don't add any code here */
742 } 765 }
743 766 else
767 next->cursp = stacklevel;
744 } 768 }
745 else if (next->tmps_ix == -2) 769 else if (next->tmps_ix == -2)
746 croak ("tried to transfer to running coroutine"); 770 croak ("tried to transfer to running coroutine");
747 else 771 else
748 { 772 {
773 LOCK;
749 SAVE (prev, -1); /* first get rid of the old state */ 774 SAVE (prev, -1); /* first get rid of the old state */
775 UNLOCK;
750 776
751 if (flags & TRANSFER_SAVE_CCTXT) 777 if (flags & TRANSFER_SAVE_CCTXT)
752 { 778 {
753 if (!prev->stack) 779 if (!prev->stack)
754 allocate_stack (prev, 0); 780 allocate_stack (prev, 0);
756 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK) 782 if (prev->stack->sptr && flags & TRANSFER_LAZY_STACK)
757 { 783 {
758 PL_top_env = &next->start_env; 784 PL_top_env = &next->start_env;
759 785
760 setup_coro (next); 786 setup_coro (next);
787 next->cursp = stacklevel;
761 788
762 prev->stack->refcnt++; 789 prev->stack->refcnt++;
763 prev->stack->usecnt++; 790 prev->stack->usecnt++;
764 next->stack = prev->stack; 791 next->stack = prev->stack;
765 next->gencnt = prev->gencnt; 792 next->gencnt = prev->gencnt;
770 allocate_stack (next, 1); 797 allocate_stack (next, 1);
771 coro_create (&(next->stack->cctx), 798 coro_create (&(next->stack->cctx),
772 setup_coro, (void *)next, 799 setup_coro, (void *)next,
773 next->stack->sptr, labs (next->stack->ssize)); 800 next->stack->sptr, labs (next->stack->ssize));
774 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx)); 801 coro_transfer (&(prev->stack->cctx), &(next->stack->cctx));
802 prev->cursp = stacklevel;
775 /* don't add any code here */ 803 /* don't add any code here */
776 } 804 }
777 } 805 }
778 else 806 else
807 {
779 setup_coro (next); 808 setup_coro (next);
809 next->cursp = stacklevel;
810 }
780 } 811 }
781
782 /*
783 * xnext is now either prev or next, depending on wether
784 * we switched the c stack or not. that's why I use a global
785 * variable, that should become thread-specific at one point.
786 */
787 xnext->cursp = stacklevel;
788 } 812 }
789 813
814 LOCK;
790 if (coro_mortal) 815 if (coro_mortal)
791 { 816 {
792 SvREFCNT_dec (coro_mortal); 817 SvREFCNT_dec (coro_mortal);
793 coro_mortal = 0; 818 coro_mortal = 0;
794 } 819 }
820 UNLOCK;
795} 821}
796 822
797#define SV_CORO(sv,func) \ 823#define SV_CORO(sv,func) \
798 do { \ 824 do { \
799 if (SvROK (sv)) \ 825 if (SvROK (sv)) \
800 sv = SvRV (sv); \ 826 sv = SvRV (sv); \
801 \ 827 \
802 if (SvTYPE(sv) == SVt_PVHV) \ 828 if (SvTYPE (sv) == SVt_PVHV) \
803 { \ 829 { \
804 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); \
805 \ 831 \
806 if (!he) \ 832 if (!he) \
807 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); \
808 \ 834 \
809 (sv) = SvRV (HeVAL(he)); \ 835 (sv) = SvRV (HeVAL(he)); \
810 } \ 836 } \
811 \ 837 \
812 /* must also be changed inside Coro::Cont::yield */ \ 838 /* must also be changed inside Coro::Cont::yield */ \
813 if (!SvOBJECT(sv) || SvSTASH(sv) != coro_state_stash) \ 839 if (!SvOBJECT (sv) || SvSTASH (sv) != coro_state_stash) \
814 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); \
815 \ 841 \
816 } while(0) 842 } while(0)
817 843
818#define SvSTATE(sv) (struct coro *)SvIV (sv) 844#define SvSTATE(sv) (struct coro *)SvIV (sv)
821api_transfer(pTHX_ SV *prev, SV *next, int flags) 847api_transfer(pTHX_ SV *prev, SV *next, int flags)
822{ 848{
823 SV_CORO (prev, "Coro::transfer"); 849 SV_CORO (prev, "Coro::transfer");
824 SV_CORO (next, "Coro::transfer"); 850 SV_CORO (next, "Coro::transfer");
825 851
826 transfer(aTHX_ SvSTATE(prev), SvSTATE(next), flags); 852 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), flags);
827} 853}
828 854
829/** Coro ********************************************************************/ 855/** Coro ********************************************************************/
830 856
831#define PRIO_MAX 3 857#define PRIO_MAX 3
839static GV *coro_current, *coro_idle; 865static GV *coro_current, *coro_idle;
840static AV *coro_ready[PRIO_MAX-PRIO_MIN+1]; 866static AV *coro_ready[PRIO_MAX-PRIO_MIN+1];
841static int coro_nready; 867static int coro_nready;
842 868
843static void 869static void
844coro_enq (SV *sv) 870coro_enq (pTHX_ SV *sv)
845{ 871{
846 if (SvTYPE (sv) == SVt_PVHV) 872 if (SvTYPE (sv) == SVt_PVHV)
847 { 873 {
848 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0); 874 SV **xprio = hv_fetch ((HV *)sv, "prio", 4, 0);
849 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL; 875 int prio = xprio ? SvIV (*xprio) : PRIO_NORMAL;
860 886
861 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");
862} 888}
863 889
864static SV * 890static SV *
865coro_deq (int min_prio) 891coro_deq (pTHX_ int min_prio)
866{ 892{
867 int prio = PRIO_MAX - PRIO_MIN; 893 int prio = PRIO_MAX - PRIO_MIN;
868 894
869 min_prio -= PRIO_MIN; 895 min_prio -= PRIO_MIN;
870 if (min_prio < 0) 896 if (min_prio < 0)
881} 907}
882 908
883static void 909static void
884api_ready (SV *coro) 910api_ready (SV *coro)
885{ 911{
912 dTHX;
913
886 if (SvROK (coro)) 914 if (SvROK (coro))
887 coro = SvRV (coro); 915 coro = SvRV (coro);
888 916
917 LOCK;
889 coro_enq (SvREFCNT_inc (coro)); 918 coro_enq (aTHX_ SvREFCNT_inc (coro));
919 UNLOCK;
890} 920}
891 921
892static void 922static void
893api_schedule (void) 923api_schedule (void)
894{ 924{
925 dTHX;
926
895 SV *prev, *next; 927 SV *prev, *next;
896 928
929 LOCK;
930
897 prev = SvRV (GvSV (coro_current)); 931 prev = SvRV (GvSV (coro_current));
898 next = coro_deq (PRIO_MIN); 932 next = coro_deq (aTHX_ PRIO_MIN);
899 933
900 if (!next) 934 if (!next)
901 next = SvREFCNT_inc (SvRV (GvSV (coro_idle))); 935 next = SvREFCNT_inc (SvRV (GvSV (coro_idle)));
902 936
903 /* free this only after the transfer */ 937 /* free this only after the transfer */
906 940
907 SvRV (GvSV (coro_current)) = next; 941 SvRV (GvSV (coro_current)) = next;
908 942
909 SV_CORO (next, "Coro::schedule"); 943 SV_CORO (next, "Coro::schedule");
910 944
945 UNLOCK;
946
911 transfer (aTHX_ SvSTATE (prev), SvSTATE (next), 947 transfer (aTHX_ SvSTATE (prev), SvSTATE (next),
912 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK); 948 TRANSFER_SAVE_ALL | TRANSFER_LAZY_STACK);
913} 949}
914 950
915static void 951static void
916api_cede (void) 952api_cede (void)
917{ 953{
954 dTHX;
955
956 LOCK;
918 coro_enq (SvREFCNT_inc (SvRV (GvSV (coro_current)))); 957 coro_enq (aTHX_ SvREFCNT_inc (SvRV (GvSV (coro_current))));
958 UNLOCK;
919 959
920 api_schedule (); 960 api_schedule ();
921} 961}
922 962
923MODULE = Coro::State PACKAGE = Coro::State 963MODULE = Coro::State PACKAGE = Coro::State
924 964
925PROTOTYPES: ENABLE 965PROTOTYPES: ENABLE
926 966
927BOOT: 967BOOT:
928{ /* {} 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
929 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1); 973 ucoro_state_sv = newSVpv (UCORO_STATE, sizeof(UCORO_STATE) - 1);
930 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1); 974 PERL_HASH(ucoro_state_hash, UCORO_STATE, sizeof(UCORO_STATE) - 1);
931 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 975 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
932 976
933 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV)); 977 newCONSTSUB (coro_state_stash, "SAVE_DEFAV", newSViv (TRANSFER_SAVE_DEFAV));
934 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV)); 978 newCONSTSUB (coro_state_stash, "SAVE_DEFSV", newSViv (TRANSFER_SAVE_DEFSV));
935 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV)); 979 newCONSTSUB (coro_state_stash, "SAVE_ERRSV", newSViv (TRANSFER_SAVE_ERRSV));
936 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT)); 980 newCONSTSUB (coro_state_stash, "SAVE_CCTXT", newSViv (TRANSFER_SAVE_CCTXT));
937
938 if (!padlist_cache)
939 padlist_cache = newHV ();
940 981
941 main_mainstack = PL_mainstack; 982 main_mainstack = PL_mainstack;
942 983
943 coroapi.ver = CORO_API_VERSION; 984 coroapi.ver = CORO_API_VERSION;
944 coroapi.transfer = api_transfer; 985 coroapi.transfer = api_transfer;
955 croak ("Coro::State::_newprocess expects an arrayref"); 996 croak ("Coro::State::_newprocess expects an arrayref");
956 997
957 Newz (0, coro, 1, struct coro); 998 Newz (0, coro, 1, struct coro);
958 999
959 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 1000 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
960 coro->mainstack = 0; /* actual work is done inside transfer */ 1001 /*coro->mainstack = 0; *//*actual work is done inside transfer */
961 coro->stack = 0; 1002 /*coro->stack = 0;*/
962 1003
963 /* same as JMPENV_BOOTSTRAP */ 1004 /* same as JMPENV_BOOTSTRAP */
964 /* 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 */
965 //Zero(&coro->start_env, 1, JMPENV); 1006 /*Zero(&coro->start_env, 1, JMPENV);*/
966 coro->start_env.je_ret = -1; 1007 coro->start_env.je_ret = -1;
967 coro->start_env.je_mustcatch = TRUE; 1008 coro->start_env.je_mustcatch = TRUE;
968 1009
969 RETVAL = coro; 1010 RETVAL = coro;
970 OUTPUT: 1011 OUTPUT:
991 if (coro->mainstack && coro->mainstack != main_mainstack) 1032 if (coro->mainstack && coro->mainstack != main_mainstack)
992 { 1033 {
993 struct coro temp; 1034 struct coro temp;
994 1035
995 PUTBACK; 1036 PUTBACK;
996 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 1037 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
997 LOAD(aTHX_ coro); 1038 LOAD (aTHX_ coro);
998 SPAGAIN; 1039 SPAGAIN;
999 1040
1000 destroy_stacks (aTHX); 1041 destroy_stacks (aTHX);
1001 1042
1002 LOAD((&temp)); /* this will get rid of defsv etc.. */ 1043 LOAD ((&temp)); /* this will get rid of defsv etc.. */
1003 SPAGAIN; 1044 SPAGAIN;
1004 1045
1005 coro->mainstack = 0; 1046 coro->mainstack = 0;
1006 } 1047 }
1007 1048
1008 deallocate_stack (coro); 1049 deallocate_stack (coro);
1009 SvREFCNT_dec (coro->args); 1050 SvREFCNT_dec (coro->args);
1010 Safefree (coro); 1051 Safefree (coro);
1011
1012void
1013flush()
1014 CODE:
1015#ifdef MAY_FLUSH
1016 flush_padlist_cache ();
1017#endif
1018 1052
1019void 1053void
1020_exit(code) 1054_exit(code)
1021 int code 1055 int code
1022 PROTOTYPE: $ 1056 PROTOTYPE: $
1023 CODE: 1057 CODE:
1024#if defined(__GLIBC__) || _POSIX_C_SOURCE
1025 _exit (code); 1058 _exit (code);
1026#else
1027 signal (SIGTERM, SIG_DFL);
1028 raise (SIGTERM);
1029 exit (code);
1030#endif
1031 1059
1032MODULE = Coro::State PACKAGE = Coro::Cont 1060MODULE = Coro::State PACKAGE = Coro::Cont
1033 1061
1034# this is slightly dirty (should expose a c-level api) 1062# this is slightly dirty (should expose a c-level api)
1035 1063
1036void 1064void
1037yield(...) 1065yield(...)
1038 PROTOTYPE: @ 1066 PROTOTYPE: @
1039 CODE: 1067 CODE:
1040 static SV *returnstk; 1068 SV *yieldstack;
1041 SV *sv; 1069 SV *sv;
1042 AV *defav = GvAV (PL_defgv); 1070 AV *defav = GvAV (PL_defgv);
1043 struct coro *prev, *next; 1071 struct coro *prev, *next;
1044 1072
1045 if (!returnstk) 1073 yieldstack = *hv_fetch (
1046 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE)); 1074 (HV *)SvRV (GvSV (coro_current)),
1075 "yieldstack", sizeof ("yieldstack") - 1,
1076 0
1077 );
1047 1078
1048 /* set up @_ -- ugly */ 1079 /* set up @_ -- ugly */
1049 av_clear (defav); 1080 av_clear (defav);
1050 av_fill (defav, items - 1); 1081 av_fill (defav, items - 1);
1051 while (items--) 1082 while (items--)
1052 av_store (defav, items, SvREFCNT_inc (ST(items))); 1083 av_store (defav, items, SvREFCNT_inc (ST(items)));
1053 1084
1054 mg_get (returnstk); /* isn't documentation wrong for mg_get? */
1055 sv = av_pop ((AV *)SvRV (returnstk)); 1085 sv = av_pop ((AV *)SvRV (yieldstack));
1056 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)));
1057 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)));
1058 SvREFCNT_dec (sv); 1088 SvREFCNT_dec (sv);
1059 1089
1060 transfer(aTHX_ prev, next, 0); 1090 transfer (aTHX_ prev, next, 0);
1061 1091
1062MODULE = Coro::State PACKAGE = Coro 1092MODULE = Coro::State PACKAGE = Coro
1063 1093
1064# this is slightly dirty (should expose a c-level api) 1094# this is slightly dirty (should expose a c-level api)
1065 1095
1094 sv_setiv(sv, (IV)&coroapi); 1124 sv_setiv(sv, (IV)&coroapi);
1095 SvREADONLY_on(sv); 1125 SvREADONLY_on(sv);
1096 } 1126 }
1097} 1127}
1098 1128
1129#if !PERL_MICRO
1130
1099void 1131void
1100ready(self) 1132ready(self)
1101 SV * self 1133 SV * self
1102 PROTOTYPE: $ 1134 PROTOTYPE: $
1103 CODE: 1135 CODE:
1104 api_ready (self); 1136 api_ready (self);
1137
1138#endif
1105 1139
1106int 1140int
1107nready(...) 1141nready(...)
1108 PROTOTYPE: 1142 PROTOTYPE:
1109 CODE: 1143 CODE:
1121cede(...) 1155cede(...)
1122 PROTOTYPE: 1156 PROTOTYPE:
1123 CODE: 1157 CODE:
1124 api_cede (); 1158 api_cede ();
1125 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