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.56 by pcg, Thu Apr 1 02:41:05 2004 UTC vs.
Revision 1.72 by root, Wed Feb 1 23:59:41 2006 UTC

1#define PERL_NO_GET_CONTEXT 1#define PERL_NO_GET_CONTEXT
2
3#include "libcoro/coro.c"
2 4
3#include "EXTERN.h" 5#include "EXTERN.h"
4#include "perl.h" 6#include "perl.h"
5#include "XSUB.h" 7#include "XSUB.h"
6 8
7#include "patchlevel.h" 9#include "patchlevel.h"
8 10
9#if PATCHLEVEL < 6 11#if PERL_VERSION < 6
10# ifndef PL_ppaddr 12# ifndef PL_ppaddr
11# define PL_ppaddr ppaddr 13# define PL_ppaddr ppaddr
12# endif 14# endif
13# ifndef call_sv 15# ifndef call_sv
14# define call_sv perl_call_sv 16# define call_sv perl_call_sv
… …
25# ifndef IS_PADCONST 27# ifndef IS_PADCONST
26# define IS_PADCONST(v) 0 28# define IS_PADCONST(v) 0
27# endif 29# endif
28#endif 30#endif
29 31
30#include "libcoro/coro.c" 32#include <errno.h>
31
32#include <signal.h> 33#include <signal.h>
33 34
34#ifdef HAVE_MMAP 35#ifdef HAVE_MMAP
35# include <unistd.h> 36# include <unistd.h>
36# include <sys/mman.h> 37# include <sys/mman.h>
… …
57 58
58#include "CoroAPI.h" 59#include "CoroAPI.h"
59 60
60#ifdef USE_ITHREADS 61#ifdef USE_ITHREADS
61static perl_mutex coro_mutex; 62static perl_mutex coro_mutex;
62# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 63# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0)
63# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 64# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0)
64#else 65#else
65# define LOCK 0 66# define LOCK (void)0
66# define UNLOCK 0 67# define UNLOCK (void)0
67#endif 68#endif
68 69
69static struct CoroAPI coroapi; 70static struct CoroAPI coroapi;
70static AV *main_mainstack; /* used to differentiate between $main and others */ 71static AV *main_mainstack; /* used to differentiate between $main and others */
71static HV *coro_state_stash; 72static HV *coro_state_stash;
72static SV *ucoro_state_sv; 73static SV *ucoro_state_sv;
73static U32 ucoro_state_hash; 74static U32 ucoro_state_hash;
74static __thread SV *coro_mortal; /* will be freed after next transfer */ 75static SV *coro_mortal; /* will be freed after next transfer */
75 76
76/* 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... */
77typedef struct { 78typedef struct {
78 int refcnt; /* pointer reference counter */ 79 int refcnt; /* pointer reference counter */
79 int usecnt; /* shared by how many coroutines */ 80 int usecnt; /* shared by how many coroutines */
… …
109 AV *mainstack; 110 AV *mainstack;
110 SV **stack_sp; 111 SV **stack_sp;
111 OP *op; 112 OP *op;
112 SV **curpad; 113 SV **curpad;
113 AV *comppad; 114 AV *comppad;
115 CV *compcv;
114 SV **stack_base; 116 SV **stack_base;
115 SV **stack_max; 117 SV **stack_max;
116 SV **tmps_stack; 118 SV **tmps_stack;
117 I32 tmps_floor; 119 I32 tmps_floor;
118 I32 tmps_ix; 120 I32 tmps_ix;
… …
127 I32 savestack_ix; 129 I32 savestack_ix;
128 I32 savestack_max; 130 I32 savestack_max;
129 OP **retstack; 131 OP **retstack;
130 I32 retstack_ix; 132 I32 retstack_ix;
131 I32 retstack_max; 133 I32 retstack_max;
134 PMOP *curpm;
132 COP *curcop; 135 COP *curcop;
133 JMPENV *top_env; 136 JMPENV *top_env;
134 137
135 /* data associated with this coroutine (initial args) */ 138 /* data associated with this coroutine (initial args) */
136 AV *args; 139 AV *args;
… …
168 av_store (newpadlist, 1, (SV *) newpad); 171 av_store (newpadlist, 1, (SV *) newpad);
169 172
170 av = newAV (); /* will be @_ */ 173 av = newAV (); /* will be @_ */
171 av_extend (av, 0); 174 av_extend (av, 0);
172 av_store (newpad, 0, (SV *) av); 175 av_store (newpad, 0, (SV *) av);
173 AvFLAGS (av) = AVf_REIFY; 176 AvREIFY_on (av);
174 177
175 for (ix = fpad; ix > 0; ix--) 178 for (ix = fpad; ix > 0; ix--)
176 { 179 {
177 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv; 180 SV *namesv = (ix <= fname) ? pname[ix] : Nullsv;
178 181
… …
270 AV *av = (AV *)mg->mg_obj; 273 AV *av = (AV *)mg->mg_obj;
271 274
272 /* casting is fun. */ 275 /* casting is fun. */
273 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 276 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
274 free_padlist (aTHX_ padlist); 277 free_padlist (aTHX_ padlist);
278
279 SvREFCNT_dec (av);
275} 280}
276 281
277#define PERL_MAGIC_coro PERL_MAGIC_ext 282#define PERL_MAGIC_coro PERL_MAGIC_ext
278 283
279static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free}; 284static MGVTBL vtbl_coro = {0, 0, 0, 0, coro_cv_free};
… …
325 PL_mainstack = c->mainstack; 330 PL_mainstack = c->mainstack;
326 PL_stack_sp = c->stack_sp; 331 PL_stack_sp = c->stack_sp;
327 PL_op = c->op; 332 PL_op = c->op;
328 PL_curpad = c->curpad; 333 PL_curpad = c->curpad;
329 PL_comppad = c->comppad; 334 PL_comppad = c->comppad;
335 PL_compcv = c->compcv;
330 PL_stack_base = c->stack_base; 336 PL_stack_base = c->stack_base;
331 PL_stack_max = c->stack_max; 337 PL_stack_max = c->stack_max;
332 PL_tmps_stack = c->tmps_stack; 338 PL_tmps_stack = c->tmps_stack;
333 PL_tmps_floor = c->tmps_floor; 339 PL_tmps_floor = c->tmps_floor;
334 PL_tmps_ix = c->tmps_ix; 340 PL_tmps_ix = c->tmps_ix;
… …
340 PL_scopestack_ix = c->scopestack_ix; 346 PL_scopestack_ix = c->scopestack_ix;
341 PL_scopestack_max = c->scopestack_max; 347 PL_scopestack_max = c->scopestack_max;
342 PL_savestack = c->savestack; 348 PL_savestack = c->savestack;
343 PL_savestack_ix = c->savestack_ix; 349 PL_savestack_ix = c->savestack_ix;
344 PL_savestack_max = c->savestack_max; 350 PL_savestack_max = c->savestack_max;
351#if PERL_VERSION < 9
345 PL_retstack = c->retstack; 352 PL_retstack = c->retstack;
346 PL_retstack_ix = c->retstack_ix; 353 PL_retstack_ix = c->retstack_ix;
347 PL_retstack_max = c->retstack_max; 354 PL_retstack_max = c->retstack_max;
355#endif
356 PL_curpm = c->curpm;
348 PL_curcop = c->curcop; 357 PL_curcop = c->curcop;
349 PL_top_env = c->top_env; 358 PL_top_env = c->top_env;
350 359
351 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav); 360 if (c->defav) REPLACE_SV (GvAV (PL_defgv), c->defav);
352 if (c->defsv) REPLACE_SV (DEFSV , c->defsv); 361 if (c->defsv) REPLACE_SV (DEFSV , c->defsv);
… …
449 c->mainstack = PL_mainstack; 458 c->mainstack = PL_mainstack;
450 c->stack_sp = PL_stack_sp; 459 c->stack_sp = PL_stack_sp;
451 c->op = PL_op; 460 c->op = PL_op;
452 c->curpad = PL_curpad; 461 c->curpad = PL_curpad;
453 c->comppad = PL_comppad; 462 c->comppad = PL_comppad;
463 c->compcv = PL_compcv;
454 c->stack_base = PL_stack_base; 464 c->stack_base = PL_stack_base;
455 c->stack_max = PL_stack_max; 465 c->stack_max = PL_stack_max;
456 c->tmps_stack = PL_tmps_stack; 466 c->tmps_stack = PL_tmps_stack;
457 c->tmps_floor = PL_tmps_floor; 467 c->tmps_floor = PL_tmps_floor;
458 c->tmps_ix = PL_tmps_ix; 468 c->tmps_ix = PL_tmps_ix;
… …
464 c->scopestack_ix = PL_scopestack_ix; 474 c->scopestack_ix = PL_scopestack_ix;
465 c->scopestack_max = PL_scopestack_max; 475 c->scopestack_max = PL_scopestack_max;
466 c->savestack = PL_savestack; 476 c->savestack = PL_savestack;
467 c->savestack_ix = PL_savestack_ix; 477 c->savestack_ix = PL_savestack_ix;
468 c->savestack_max = PL_savestack_max; 478 c->savestack_max = PL_savestack_max;
479#if PERL_VERSION < 9
469 c->retstack = PL_retstack; 480 c->retstack = PL_retstack;
470 c->retstack_ix = PL_retstack_ix; 481 c->retstack_ix = PL_retstack_ix;
471 c->retstack_max = PL_retstack_max; 482 c->retstack_max = PL_retstack_max;
483#endif
484 c->curpm = PL_curpm;
472 c->curcop = PL_curcop; 485 c->curcop = PL_curcop;
473 c->top_env = PL_top_env; 486 c->top_env = PL_top_env;
474} 487}
475 488
476/* 489/*
… …
512 525
513 New(54,PL_savestack,96,ANY); 526 New(54,PL_savestack,96,ANY);
514 PL_savestack_ix = 0; 527 PL_savestack_ix = 0;
515 PL_savestack_max = 96; 528 PL_savestack_max = 96;
516 529
530#if PERL_VERSION < 9
517 New(54,PL_retstack,8,OP*); 531 New(54,PL_retstack,8,OP*);
518 PL_retstack_ix = 0; 532 PL_retstack_ix = 0;
519 PL_retstack_max = 8; 533 PL_retstack_max = 8;
534#endif
520 535
521 UNLOCK; 536 UNLOCK;
522} 537}
523 538
524/* 539/*
… …
532 /* is this ugly, I ask? */ 547 /* is this ugly, I ask? */
533 LEAVE_SCOPE (0); 548 LEAVE_SCOPE (0);
534 549
535 /* sure it is, but more important: is it correct?? :/ */ 550 /* sure it is, but more important: is it correct?? :/ */
536 FREETMPS; 551 FREETMPS;
552
553 /*POPSTACK_TO (PL_mainstack);*//*D*//*use*/
537 } 554 }
538 555
539 while (PL_curstackinfo->si_next) 556 while (PL_curstackinfo->si_next)
540 PL_curstackinfo = PL_curstackinfo->si_next; 557 PL_curstackinfo = PL_curstackinfo->si_next;
541 558
542 while (PL_curstackinfo) 559 while (PL_curstackinfo)
543 { 560 {
544 PERL_SI *p = PL_curstackinfo->si_prev; 561 PERL_SI *p = PL_curstackinfo->si_prev;
545 562
546 { 563 { /*D*//*remove*/
547 dSP; 564 dSP;
548 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack); 565 SWITCHSTACK (PL_curstack, PL_curstackinfo->si_stack);
549 PUTBACK; /* possibly superfluous */ 566 PUTBACK; /* possibly superfluous */
550 } 567 }
551 568
552 if (!IN_DESTRUCT) 569 if (!IN_DESTRUCT)
553 { 570 {
554 dounwind(-1); 571 dounwind (-1);/*D*//*remove*/
555 SvREFCNT_dec(PL_curstackinfo->si_stack); 572 SvREFCNT_dec (PL_curstackinfo->si_stack);
556 } 573 }
557 574
558 Safefree(PL_curstackinfo->si_cxstack); 575 Safefree (PL_curstackinfo->si_cxstack);
559 Safefree(PL_curstackinfo); 576 Safefree (PL_curstackinfo);
560 PL_curstackinfo = p; 577 PL_curstackinfo = p;
561 } 578 }
562 579
563 Safefree(PL_tmps_stack); 580 Safefree (PL_tmps_stack);
564 Safefree(PL_markstack); 581 Safefree (PL_markstack);
565 Safefree(PL_scopestack); 582 Safefree (PL_scopestack);
566 Safefree(PL_savestack); 583 Safefree (PL_savestack);
584#if PERL_VERSION < 9
567 Safefree(PL_retstack); 585 Safefree (PL_retstack);
586#endif
568} 587}
569 588
570static void 589static void
571allocate_stack (Coro__State ctx, int alloc) 590allocate_stack (Coro__State ctx, int alloc)
572{ 591{
… …
579 stack->gencnt = ctx->gencnt = 0; 598 stack->gencnt = ctx->gencnt = 0;
580 599
581 if (alloc) 600 if (alloc)
582 { 601 {
583#if HAVE_MMAP 602#if HAVE_MMAP
584 stack->ssize = 16384 * 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 = - (8192 * sizeof (long)); 609 stack->ssize = - (STACKSIZE * sizeof (long));
591 New (0, stack->sptr, 8192, 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
… …
977 croak ("Coro::State::_newprocess expects an arrayref"); 996 croak ("Coro::State::_newprocess expects an arrayref");
978 997
979 Newz (0, coro, 1, struct coro); 998 Newz (0, coro, 1, struct coro);
980 999
981 coro->args = (AV *)SvREFCNT_inc (SvRV (args)); 1000 coro->args = (AV *)SvREFCNT_inc (SvRV (args));
982 coro->mainstack = 0; /* actual work is done inside transfer */ 1001 /*coro->mainstack = 0; *//*actual work is done inside transfer */
983 coro->stack = 0; 1002 /*coro->stack = 0;*/
984 1003
985 /* same as JMPENV_BOOTSTRAP */ 1004 /* same as JMPENV_BOOTSTRAP */
986 /* 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 */
987 //Zero(&coro->start_env, 1, JMPENV); 1006 /*Zero(&coro->start_env, 1, JMPENV);*/
988 coro->start_env.je_ret = -1; 1007 coro->start_env.je_ret = -1;
989 coro->start_env.je_mustcatch = TRUE; 1008 coro->start_env.je_mustcatch = TRUE;
990 1009
991 RETVAL = coro; 1010 RETVAL = coro;
992 OUTPUT: 1011 OUTPUT:
… …
1013 if (coro->mainstack && coro->mainstack != main_mainstack) 1032 if (coro->mainstack && coro->mainstack != main_mainstack)
1014 { 1033 {
1015 struct coro temp; 1034 struct coro temp;
1016 1035
1017 PUTBACK; 1036 PUTBACK;
1018 SAVE(aTHX_ (&temp), TRANSFER_SAVE_ALL); 1037 SAVE (aTHX_ (&temp), TRANSFER_SAVE_ALL);
1019 LOAD(aTHX_ coro); 1038 LOAD (aTHX_ coro);
1020 SPAGAIN; 1039 SPAGAIN;
1021 1040
1022 destroy_stacks (aTHX); 1041 destroy_stacks (aTHX);
1023 1042
1024 LOAD((&temp)); /* this will get rid of defsv etc.. */ 1043 LOAD ((&temp)); /* this will get rid of defsv etc.. */
1025 SPAGAIN; 1044 SPAGAIN;
1026 1045
1027 coro->mainstack = 0; 1046 coro->mainstack = 0;
1028 } 1047 }
1029 1048
… …
1044 1063
1045void 1064void
1046yield(...) 1065yield(...)
1047 PROTOTYPE: @ 1066 PROTOTYPE: @
1048 CODE: 1067 CODE:
1049 static SV *returnstk; 1068 SV *yieldstack;
1050 SV *sv; 1069 SV *sv;
1051 AV *defav = GvAV (PL_defgv); 1070 AV *defav = GvAV (PL_defgv);
1052 struct coro *prev, *next; 1071 struct coro *prev, *next;
1053 1072
1054 if (!returnstk) 1073 yieldstack = *hv_fetch (
1055 returnstk = SvRV ((SV *)get_sv ("Coro::Cont::return", FALSE)); 1074 (HV *)SvRV (GvSV (coro_current)),
1075 "yieldstack", sizeof ("yieldstack") - 1,
1076 0
1077 );
1056 1078
1057 /* set up @_ -- ugly */ 1079 /* set up @_ -- ugly */
1058 av_clear (defav); 1080 av_clear (defav);
1059 av_fill (defav, items - 1); 1081 av_fill (defav, items - 1);
1060 while (items--) 1082 while (items--)
1061 av_store (defav, items, SvREFCNT_inc (ST(items))); 1083 av_store (defav, items, SvREFCNT_inc (ST(items)));
1062 1084
1063 mg_get (returnstk); /* isn't documentation wrong for mg_get? */
1064 sv = av_pop ((AV *)SvRV (returnstk)); 1085 sv = av_pop ((AV *)SvRV (yieldstack));
1065 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)));
1066 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)));
1067 SvREFCNT_dec (sv); 1088 SvREFCNT_dec (sv);
1068 1089
1069 transfer(aTHX_ prev, next, 0); 1090 transfer (aTHX_ prev, next, 0);
1070 1091
1071MODULE = Coro::State PACKAGE = Coro 1092MODULE = Coro::State PACKAGE = Coro
1072 1093
1073# this is slightly dirty (should expose a c-level api) 1094# this is slightly dirty (should expose a c-level api)
1074 1095
… …
1134cede(...) 1155cede(...)
1135 PROTOTYPE: 1156 PROTOTYPE:
1136 CODE: 1157 CODE:
1137 api_cede (); 1158 api_cede ();
1138 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