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.243 by root, Sat Aug 30 03:07:46 2008 UTC vs.
Revision 1.257 by root, Sun Nov 9 15:35:44 2008 UTC

… …
4#define PERL_EXT 4#define PERL_EXT
5 5
6#include "EXTERN.h" 6#include "EXTERN.h"
7#include "perl.h" 7#include "perl.h"
8#include "XSUB.h" 8#include "XSUB.h"
9#include "perliol.h"
9 10
10#include "patchlevel.h" 11#include "patchlevel.h"
11 12
12#include <stdio.h> 13#include <stdio.h>
13#include <errno.h> 14#include <errno.h>
… …
51#else 52#else
52# define REGISTER_STACK(cctx,start,end) 53# define REGISTER_STACK(cctx,start,end)
53#endif 54#endif
54 55
55/* the maximum number of idle cctx that will be pooled */ 56/* the maximum number of idle cctx that will be pooled */
56#define MAX_IDLE_CCTX 8 57static int cctx_max_idle = 4;
57 58
58#define PERL_VERSION_ATLEAST(a,b,c) \ 59#define PERL_VERSION_ATLEAST(a,b,c) \
59 (PERL_REVISION > (a) \ 60 (PERL_REVISION > (a) \
60 || (PERL_REVISION == (a) \ 61 || (PERL_REVISION == (a) \
61 && (PERL_VERSION > (b) \ 62 && (PERL_VERSION > (b) \
… …
80# ifndef IS_PADCONST 81# ifndef IS_PADCONST
81# define IS_PADCONST(v) 0 82# define IS_PADCONST(v) 0
82# endif 83# endif
83#endif 84#endif
84 85
86/* 5.11 */
87#ifndef CxHASARGS
88# define CxHASARGS(cx) (cx)->blk_sub.hasargs
89#endif
90
91/* 5.10.0 */
92#ifndef SvREFCNT_inc_NN
93# define SvREFCNT_inc_NN(sv) SvREFCNT_inc (sv)
94#endif
95
85/* 5.8.8 */ 96/* 5.8.8 */
86#ifndef GV_NOTQUAL 97#ifndef GV_NOTQUAL
87# define GV_NOTQUAL 0 98# define GV_NOTQUAL 0
88#endif 99#endif
89#ifndef newSV 100#ifndef newSV
90# define newSV(l) NEWSV(0,l) 101# define newSV(l) NEWSV(0,l)
91#endif
92
93/* 5.11 */
94#ifndef CxHASARGS
95# define CxHASARGS(cx) (cx)->blk_sub.hasargs
96#endif 102#endif
97 103
98/* 5.8.7 */ 104/* 5.8.7 */
99#ifndef SvRV_set 105#ifndef SvRV_set
100# define SvRV_set(s,v) SvRV(s) = (v) 106# define SvRV_set(s,v) SvRV(s) = (v)
… …
136#define NOINLINE attribute ((noinline)) 142#define NOINLINE attribute ((noinline))
137 143
138#include "CoroAPI.h" 144#include "CoroAPI.h"
139 145
140#ifdef USE_ITHREADS 146#ifdef USE_ITHREADS
147
141static perl_mutex coro_mutex; 148static perl_mutex coro_lock;
142# define LOCK do { MUTEX_LOCK (&coro_mutex); } while (0) 149# define LOCK do { MUTEX_LOCK (&coro_lock); } while (0)
143# define UNLOCK do { MUTEX_UNLOCK (&coro_mutex); } while (0) 150# define UNLOCK do { MUTEX_UNLOCK (&coro_lock); } while (0)
151# if CORO_PTHREAD
152static void *coro_thx;
153# endif
154
144#else 155#else
156
145# define LOCK (void)0 157# define LOCK (void)0
146# define UNLOCK (void)0 158# define UNLOCK (void)0
159
147#endif 160#endif
161
162# undef LOCK
163# define LOCK (void)0
164# undef UNLOCK
165# define UNLOCK (void)0
148 166
149/* helper storage struct for Coro::AIO */ 167/* helper storage struct for Coro::AIO */
150struct io_state 168struct io_state
151{ 169{
170 AV *res;
152 int errorno; 171 int errorno;
153 I32 laststype; 172 I32 laststype; /* U16 in 5.10.0 */
154 int laststatval; 173 int laststatval;
155 Stat_t statcache; 174 Stat_t statcache;
156}; 175};
157 176
177static double (*nvtime)(); /* so why doesn't it take void? */
178
179static U32 cctx_gen;
158static size_t coro_stacksize = CORO_STACKSIZE; 180static size_t cctx_stacksize = CORO_STACKSIZE;
159static struct CoroAPI coroapi; 181static struct CoroAPI coroapi;
160static AV *main_mainstack; /* used to differentiate between $main and others */ 182static AV *main_mainstack; /* used to differentiate between $main and others */
161static JMPENV *main_top_env; 183static JMPENV *main_top_env;
162static HV *coro_state_stash, *coro_stash; 184static HV *coro_state_stash, *coro_stash;
163static volatile SV *coro_mortal; /* will be freed after next transfer */ 185static volatile SV *coro_mortal; /* will be freed/thrown after next transfer */
164 186
165static GV *irsgv; /* $/ */ 187static GV *irsgv; /* $/ */
166static GV *stdoutgv; /* *STDOUT */ 188static GV *stdoutgv; /* *STDOUT */
167static SV *rv_diehook; 189static SV *rv_diehook;
168static SV *rv_warnhook; 190static SV *rv_warnhook;
… …
200 void *idle_sp; /* sp of top-level transfer/schedule/cede call */ 222 void *idle_sp; /* sp of top-level transfer/schedule/cede call */
201 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */ 223 JMPENV *idle_te; /* same as idle_sp, but for top_env, TODO: remove once stable */
202 JMPENV *top_env; 224 JMPENV *top_env;
203 coro_context cctx; 225 coro_context cctx;
204 226
227 U32 gen;
205#if CORO_USE_VALGRIND 228#if CORO_USE_VALGRIND
206 int valgrind_id; 229 int valgrind_id;
207#endif 230#endif
208 unsigned char flags; 231 unsigned char flags;
209} coro_cctx; 232} coro_cctx;
… …
269#define PRIO_MIN -4 292#define PRIO_MIN -4
270 293
271/* for Coro.pm */ 294/* for Coro.pm */
272static SV *coro_current; 295static SV *coro_current;
273static SV *coro_readyhook; 296static SV *coro_readyhook;
274static AV *coro_ready [PRIO_MAX-PRIO_MIN+1]; 297static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1];
275static int coro_nready; 298static int coro_nready;
276static struct coro *coro_first; 299static struct coro *coro_first;
277 300
278/** lowlevel stuff **********************************************************/ 301/** lowlevel stuff **********************************************************/
279 302
… …
321 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 344 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
322#endif 345#endif
323 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 346 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
324 --AvFILLp (padlist); 347 --AvFILLp (padlist);
325 348
326 av_store (newpadlist, 0, SvREFCNT_inc (*av_fetch (padlist, 0, FALSE))); 349 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE)));
327 av_store (newpadlist, 1, (SV *)newpad); 350 av_store (newpadlist, 1, (SV *)newpad);
328 351
329 return newpadlist; 352 return newpadlist;
330} 353}
331 354
… …
361 384
362 /* casting is fun. */ 385 /* casting is fun. */
363 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av))) 386 while (&PL_sv_undef != (SV *)(padlist = (AV *)av_pop (av)))
364 free_padlist (aTHX_ padlist); 387 free_padlist (aTHX_ padlist);
365 388
389 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
390
366 return 0; 391 return 0;
367} 392}
368 393
369#define CORO_MAGIC_type_cv PERL_MAGIC_ext 394#define CORO_MAGIC_type_cv PERL_MAGIC_ext
370#define CORO_MAGIC_type_state PERL_MAGIC_ext 395#define CORO_MAGIC_type_state PERL_MAGIC_ext
… …
372static MGVTBL coro_cv_vtbl = { 397static MGVTBL coro_cv_vtbl = {
373 0, 0, 0, 0, 398 0, 0, 0, 0,
374 coro_cv_free 399 coro_cv_free
375}; 400};
376 401
377#define CORO_MAGIC(sv,type) \ 402#define CORO_MAGIC(sv, type) \
378 SvMAGIC (sv) \ 403 SvMAGIC (sv) \
379 ? SvMAGIC (sv)->mg_type == type \ 404 ? SvMAGIC (sv)->mg_type == type \
380 ? SvMAGIC (sv) \ 405 ? SvMAGIC (sv) \
381 : mg_find (sv, type) \ 406 : mg_find (sv, type) \
382 : 0 407 : 0
383 408
384#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv) 409#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
385#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state) 410#define CORO_MAGIC_state(sv) CORO_MAGIC (((SV *)(sv)), CORO_MAGIC_type_state)
386 411
387static struct coro * 412static struct coro *
… …
420 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0)) 445 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
421 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 446 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
422 else 447 else
423 { 448 {
424#if CORO_PREFER_PERL_FUNCTIONS 449#if CORO_PREFER_PERL_FUNCTIONS
425 /* this is probably cleaner, but also slower? */ 450 /* this is probably cleaner? but also slower! */
451 /* in practise, it seems to be less stable */
426 CV *cp = Perl_cv_clone (cv); 452 CV *cp = Perl_cv_clone (cv);
427 CvPADLIST (cv) = CvPADLIST (cp); 453 CvPADLIST (cv) = CvPADLIST (cp);
428 CvPADLIST (cp) = 0; 454 CvPADLIST (cp) = 0;
429 SvREFCNT_dec (cp); 455 SvREFCNT_dec (cp);
430#else 456#else
… …
616 642
617/* 643/*
618 * destroy the stacks, the callchain etc... 644 * destroy the stacks, the callchain etc...
619 */ 645 */
620static void 646static void
621coro_destroy_stacks (pTHX) 647coro_destruct_stacks (pTHX)
622{ 648{
623 while (PL_curstackinfo->si_next) 649 while (PL_curstackinfo->si_next)
624 PL_curstackinfo = PL_curstackinfo->si_next; 650 PL_curstackinfo = PL_curstackinfo->si_next;
625 651
626 while (PL_curstackinfo) 652 while (PL_curstackinfo)
… …
663 #undef VAR 689 #undef VAR
664 } 690 }
665 else 691 else
666 slot = coro->slot; 692 slot = coro->slot;
667 693
694 if (slot)
695 {
668 rss += sizeof (slot->curstackinfo); 696 rss += sizeof (slot->curstackinfo);
669 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT); 697 rss += (slot->curstackinfo->si_cxmax + 1) * sizeof (PERL_CONTEXT);
670 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *); 698 rss += sizeof (SV) + sizeof (struct xpvav) + (1 + AvMAX (slot->curstack)) * sizeof (SV *);
671 rss += slot->tmps_max * sizeof (SV *); 699 rss += slot->tmps_max * sizeof (SV *);
672 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32); 700 rss += (slot->markstack_max - slot->markstack_ptr) * sizeof (I32);
673 rss += slot->scopestack_max * sizeof (I32); 701 rss += slot->scopestack_max * sizeof (I32);
674 rss += slot->savestack_max * sizeof (ANY); 702 rss += slot->savestack_max * sizeof (ANY);
675 703
676#if !PERL_VERSION_ATLEAST (5,10,0) 704#if !PERL_VERSION_ATLEAST (5,10,0)
677 rss += slot->retstack_max * sizeof (OP *); 705 rss += slot->retstack_max * sizeof (OP *);
678#endif 706#endif
707 }
679 } 708 }
680 709
681 return rss; 710 return rss;
682} 711}
683 712
… …
801 GvSV (PL_defgv) = newSV (0); 830 GvSV (PL_defgv) = newSV (0);
802 GvAV (PL_defgv) = coro->args; coro->args = 0; 831 GvAV (PL_defgv) = coro->args; coro->args = 0;
803 GvSV (PL_errgv) = newSV (0); 832 GvSV (PL_errgv) = newSV (0);
804 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 833 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
805 PL_rs = newSVsv (GvSV (irsgv)); 834 PL_rs = newSVsv (GvSV (irsgv));
806 PL_defoutgv = (GV *)SvREFCNT_inc (stdoutgv); 835 PL_defoutgv = (GV *)SvREFCNT_inc_NN (stdoutgv);
807 836
808 { 837 {
809 dSP; 838 dSP;
810 LOGOP myop; 839 LOGOP myop;
811 840
… …
828 */ 857 */
829 ENTER; 858 ENTER;
830} 859}
831 860
832static void 861static void
833coro_destroy (pTHX_ struct coro *coro) 862coro_destruct (pTHX_ struct coro *coro)
834{ 863{
835 if (!IN_DESTRUCT) 864 if (!IN_DESTRUCT)
836 { 865 {
837 /* restore all saved variables and stuff */ 866 /* restore all saved variables and stuff */
838 LEAVE_SCOPE (0); 867 LEAVE_SCOPE (0);
… …
860 SvREFCNT_dec (PL_warnhook); 889 SvREFCNT_dec (PL_warnhook);
861 890
862 SvREFCNT_dec (coro->saved_deffh); 891 SvREFCNT_dec (coro->saved_deffh);
863 SvREFCNT_dec (coro->throw); 892 SvREFCNT_dec (coro->throw);
864 893
865 coro_destroy_stacks (aTHX); 894 coro_destruct_stacks (aTHX);
866} 895}
867 896
868static void 897static void
869free_coro_mortal (pTHX) 898free_coro_mortal (pTHX)
870{ 899{
… …
907 : cx->blk_gimme == G_SCALAR ? bot + 1 936 : cx->blk_gimme == G_SCALAR ? bot + 1
908 : bot; 937 : bot;
909 938
910 av_extend (av, top - bot); 939 av_extend (av, top - bot);
911 while (bot < top) 940 while (bot < top)
912 av_push (av, SvREFCNT_inc (*bot++)); 941 av_push (av, SvREFCNT_inc_NN (*bot++));
913 942
914 PL_runops = RUNOPS_DEFAULT; 943 PL_runops = RUNOPS_DEFAULT;
915 ENTER; 944 ENTER;
916 SAVETMPS; 945 SAVETMPS;
917 EXTEND (SP, 3); 946 EXTEND (SP, 3);
… …
1031 * this is a _very_ stripped down perl interpreter ;) 1060 * this is a _very_ stripped down perl interpreter ;)
1032 */ 1061 */
1033static void 1062static void
1034cctx_run (void *arg) 1063cctx_run (void *arg)
1035{ 1064{
1065#ifdef USE_ITHREADS
1066# if CORO_PTHREAD
1067 PERL_SET_CONTEXT (coro_thx);
1068# endif
1069#endif
1070 {
1036 dTHX; 1071 dTHX;
1037 1072
1038 /* cctx_run is the alternative tail of transfer(), so unlock here. */ 1073 /* cctx_run is the alternative tail of transfer(), so unlock here. */
1039 UNLOCK; 1074 UNLOCK;
1040 1075
1041 /* we now skip the entersub that lead to transfer() */ 1076 /* we now skip the entersub that lead to transfer() */
1042 PL_op = PL_op->op_next; 1077 PL_op = PL_op->op_next;
1043 1078
1044 /* inject a fake subroutine call to cctx_init */ 1079 /* inject a fake subroutine call to cctx_init */
1045 cctx_prepare (aTHX_ (coro_cctx *)arg); 1080 cctx_prepare (aTHX_ (coro_cctx *)arg);
1046 1081
1047 /* somebody or something will hit me for both perl_run and PL_restartop */ 1082 /* somebody or something will hit me for both perl_run and PL_restartop */
1048 PL_restartop = PL_op; 1083 PL_restartop = PL_op;
1049 perl_run (PL_curinterp); 1084 perl_run (PL_curinterp);
1050 1085
1051 /* 1086 /*
1052 * If perl-run returns we assume exit() was being called or the coro 1087 * If perl-run returns we assume exit() was being called or the coro
1053 * fell off the end, which seems to be the only valid (non-bug) 1088 * fell off the end, which seems to be the only valid (non-bug)
1054 * reason for perl_run to return. We try to exit by jumping to the 1089 * reason for perl_run to return. We try to exit by jumping to the
1055 * bootstrap-time "top" top_env, as we cannot restore the "main" 1090 * bootstrap-time "top" top_env, as we cannot restore the "main"
1056 * coroutine as Coro has no such concept 1091 * coroutine as Coro has no such concept
1057 */ 1092 */
1058 PL_top_env = main_top_env; 1093 PL_top_env = main_top_env;
1059 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1094 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1095 }
1060} 1096}
1061 1097
1062static coro_cctx * 1098static coro_cctx *
1063cctx_new () 1099cctx_new ()
1064{ 1100{
1065 coro_cctx *cctx; 1101 coro_cctx *cctx;
1066 void *stack_start; 1102 void *stack_start;
1067 size_t stack_size; 1103 size_t stack_size;
1068 1104
1069 ++cctx_count; 1105 ++cctx_count;
1070
1071 Newz (0, cctx, 1, coro_cctx); 1106 Newz (0, cctx, 1, coro_cctx);
1072 1107
1108 cctx->gen = cctx_gen;
1109
1073#if HAVE_MMAP 1110#if HAVE_MMAP
1074 cctx->ssize = ((coro_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE; 1111 cctx->ssize = ((cctx_stacksize * sizeof (long) + PAGESIZE - 1) / PAGESIZE + CORO_STACKGUARD) * PAGESIZE;
1075 /* mmap supposedly does allocate-on-write for us */ 1112 /* mmap supposedly does allocate-on-write for us */
1076 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0); 1113 cctx->sptr = mmap (0, cctx->ssize, PROT_EXEC|PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, 0, 0);
1077 1114
1078 if (cctx->sptr != (void *)-1) 1115 if (cctx->sptr != (void *)-1)
1079 { 1116 {
… …
1085 cctx->flags |= CC_MAPPED; 1122 cctx->flags |= CC_MAPPED;
1086 } 1123 }
1087 else 1124 else
1088#endif 1125#endif
1089 { 1126 {
1090 cctx->ssize = coro_stacksize * (long)sizeof (long); 1127 cctx->ssize = cctx_stacksize * (long)sizeof (long);
1091 New (0, cctx->sptr, coro_stacksize, long); 1128 New (0, cctx->sptr, cctx_stacksize, long);
1092 1129
1093 if (!cctx->sptr) 1130 if (!cctx->sptr)
1094 { 1131 {
1095 perror ("FATAL: unable to allocate stack for coroutine"); 1132 perror ("FATAL: unable to allocate stack for coroutine");
1096 _exit (EXIT_FAILURE); 1133 _exit (EXIT_FAILURE);
… …
1111{ 1148{
1112 if (!cctx) 1149 if (!cctx)
1113 return; 1150 return;
1114 1151
1115 --cctx_count; 1152 --cctx_count;
1153 coro_destroy (&cctx->cctx);
1116 1154
1155 /* coro_transfer creates new, empty cctx's */
1156 if (cctx->sptr)
1157 {
1117#if CORO_USE_VALGRIND 1158#if CORO_USE_VALGRIND
1118 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id); 1159 VALGRIND_STACK_DEREGISTER (cctx->valgrind_id);
1119#endif 1160#endif
1120 1161
1121#if HAVE_MMAP 1162#if HAVE_MMAP
1122 if (cctx->flags & CC_MAPPED) 1163 if (cctx->flags & CC_MAPPED)
1123 munmap (cctx->sptr, cctx->ssize); 1164 munmap (cctx->sptr, cctx->ssize);
1124 else 1165 else
1125#endif 1166#endif
1126 Safefree (cctx->sptr); 1167 Safefree (cctx->sptr);
1168 }
1127 1169
1128 Safefree (cctx); 1170 Safefree (cctx);
1129} 1171}
1130 1172
1131/* wether this cctx should be destructed */ 1173/* wether this cctx should be destructed */
1132#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE)) 1174#define CCTX_EXPIRED(cctx) ((cctx)->gen != cctx_gen || ((cctx)->flags & CC_NOREUSE))
1133 1175
1134static coro_cctx * 1176static coro_cctx *
1135cctx_get (pTHX) 1177cctx_get (pTHX)
1136{ 1178{
1137 while (expect_true (cctx_first)) 1179 while (expect_true (cctx_first))
… …
1150} 1192}
1151 1193
1152static void 1194static void
1153cctx_put (coro_cctx *cctx) 1195cctx_put (coro_cctx *cctx)
1154{ 1196{
1197 assert (("cctx_put called on non-initialised cctx", cctx->sptr));
1198
1155 /* free another cctx if overlimit */ 1199 /* free another cctx if overlimit */
1156 if (expect_false (cctx_idle >= MAX_IDLE_CCTX)) 1200 if (expect_false (cctx_idle >= cctx_max_idle))
1157 { 1201 {
1158 coro_cctx *first = cctx_first; 1202 coro_cctx *first = cctx_first;
1159 cctx_first = first->next; 1203 cctx_first = first->next;
1160 --cctx_idle; 1204 --cctx_idle;
1161 1205
… …
1193/* always use the TRANSFER macro */ 1237/* always use the TRANSFER macro */
1194static void NOINLINE 1238static void NOINLINE
1195transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx) 1239transfer (pTHX_ struct coro *prev, struct coro *next, int force_cctx)
1196{ 1240{
1197 dSTACKLEVEL; 1241 dSTACKLEVEL;
1198 static volatile int has_throw;
1199 1242
1200 /* sometimes transfer is only called to set idle_sp */ 1243 /* sometimes transfer is only called to set idle_sp */
1201 if (expect_false (!next)) 1244 if (expect_false (!next))
1202 { 1245 {
1203 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1246 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
1204 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1247 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
1205 } 1248 }
1206 else if (expect_true (prev != next)) 1249 else if (expect_true (prev != next))
1207 { 1250 {
1251 static volatile int has_throw;
1208 coro_cctx *prev__cctx; 1252 coro_cctx *prev__cctx;
1209 1253
1210 if (expect_false (prev->flags & CF_NEW)) 1254 if (expect_false (prev->flags & CF_NEW))
1211 { 1255 {
1212 /* create a new empty context */ 1256 /* create a new empty/source context */
1257 ++cctx_count;
1213 Newz (0, prev->cctx, 1, coro_cctx); 1258 New (0, prev->cctx, 1, coro_cctx);
1259 prev->cctx->sptr = 0;
1260 coro_create (&prev->cctx->cctx, 0, 0, 0, 0);
1261
1214 prev->flags &= ~CF_NEW; 1262 prev->flags &= ~CF_NEW;
1215 prev->flags |= CF_RUNNING; 1263 prev->flags |= CF_RUNNING;
1216 } 1264 }
1217 1265
1218 prev->flags &= ~CF_RUNNING; 1266 prev->flags &= ~CF_RUNNING;
… …
1325 croak ("FATAL: tried to destroy currently running coroutine"); 1373 croak ("FATAL: tried to destroy currently running coroutine");
1326 1374
1327 save_perl (aTHX_ &temp); 1375 save_perl (aTHX_ &temp);
1328 load_perl (aTHX_ coro); 1376 load_perl (aTHX_ coro);
1329 1377
1330 coro_destroy (aTHX_ coro); 1378 coro_destruct (aTHX_ coro);
1331 1379
1332 load_perl (aTHX_ &temp); 1380 load_perl (aTHX_ &temp);
1333 1381
1334 coro->slot = 0; 1382 coro->slot = 0;
1335 } 1383 }
… …
1441 LOCK; 1489 LOCK;
1442 1490
1443 sv_hook = coro_nready ? 0 : coro_readyhook; 1491 sv_hook = coro_nready ? 0 : coro_readyhook;
1444 xs_hook = coro_nready ? 0 : coroapi.readyhook; 1492 xs_hook = coro_nready ? 0 : coroapi.readyhook;
1445 1493
1446 coro_enq (aTHX_ SvREFCNT_inc (coro_sv)); 1494 coro_enq (aTHX_ SvREFCNT_inc_NN (coro_sv));
1447 ++coro_nready; 1495 ++coro_nready;
1448 1496
1449 UNLOCK; 1497 UNLOCK;
1450 1498
1451 if (sv_hook) 1499 if (sv_hook)
… …
1623 else 1671 else
1624 coro->slot->runops = RUNOPS_DEFAULT; 1672 coro->slot->runops = RUNOPS_DEFAULT;
1625 } 1673 }
1626} 1674}
1627 1675
1676#if 0
1628static int 1677static int
1629coro_gensub_free (pTHX_ SV *sv, MAGIC *mg) 1678coro_gensub_free (pTHX_ SV *sv, MAGIC *mg)
1630{ 1679{
1631 AV *padlist; 1680 AV *padlist;
1632 AV *av = (AV *)mg->mg_obj; 1681 AV *av = (AV *)mg->mg_obj;
… …
1638 1687
1639static MGVTBL coro_gensub_vtbl = { 1688static MGVTBL coro_gensub_vtbl = {
1640 0, 0, 0, 0, 1689 0, 0, 0, 0,
1641 coro_gensub_free 1690 coro_gensub_free
1642}; 1691};
1692#endif
1693
1694/*****************************************************************************/
1695/* PerlIO::cede */
1696
1697typedef struct
1698{
1699 PerlIOBuf base;
1700 NV next, every;
1701} PerlIOCede;
1702
1703static IV
1704PerlIOCede_pushed (pTHX_ PerlIO *f, const char *mode, SV *arg, PerlIO_funcs *tab)
1705{
1706 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1707
1708 self->every = SvCUR (arg) ? SvNV (arg) : 0.01;
1709 self->next = nvtime () + self->every;
1710
1711 return PerlIOBuf_pushed (aTHX_ f, mode, Nullsv, tab);
1712}
1713
1714static SV *
1715PerlIOCede_getarg (pTHX_ PerlIO *f, CLONE_PARAMS *param, int flags)
1716{
1717 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1718
1719 return newSVnv (self->every);
1720}
1721
1722static IV
1723PerlIOCede_flush (pTHX_ PerlIO *f)
1724{
1725 PerlIOCede *self = PerlIOSelf (f, PerlIOCede);
1726 double now = nvtime ();
1727
1728 if (now >= self->next)
1729 {
1730 api_cede ();
1731 self->next = now + self->every;
1732 }
1733
1734 return PerlIOBuf_flush (aTHX_ f);
1735}
1736
1737static PerlIO_funcs PerlIO_cede =
1738{
1739 sizeof(PerlIO_funcs),
1740 "cede",
1741 sizeof(PerlIOCede),
1742 PERLIO_K_DESTRUCT | PERLIO_K_RAW,
1743 PerlIOCede_pushed,
1744 PerlIOBuf_popped,
1745 PerlIOBuf_open,
1746 PerlIOBase_binmode,
1747 PerlIOCede_getarg,
1748 PerlIOBase_fileno,
1749 PerlIOBuf_dup,
1750 PerlIOBuf_read,
1751 PerlIOBuf_unread,
1752 PerlIOBuf_write,
1753 PerlIOBuf_seek,
1754 PerlIOBuf_tell,
1755 PerlIOBuf_close,
1756 PerlIOCede_flush,
1757 PerlIOBuf_fill,
1758 PerlIOBase_eof,
1759 PerlIOBase_error,
1760 PerlIOBase_clearerr,
1761 PerlIOBase_setlinebuf,
1762 PerlIOBuf_get_base,
1763 PerlIOBuf_bufsiz,
1764 PerlIOBuf_get_ptr,
1765 PerlIOBuf_get_cnt,
1766 PerlIOBuf_set_ptrcnt,
1767};
1768
1643 1769
1644MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_ 1770MODULE = Coro::State PACKAGE = Coro::State PREFIX = api_
1645 1771
1646PROTOTYPES: DISABLE 1772PROTOTYPES: DISABLE
1647 1773
1648BOOT: 1774BOOT:
1649{ 1775{
1650#ifdef USE_ITHREADS 1776#ifdef USE_ITHREADS
1651 MUTEX_INIT (&coro_mutex); 1777 MUTEX_INIT (&coro_lock);
1778# if CORO_PTHREAD
1779 coro_thx = PERL_GET_CONTEXT;
1780# endif
1652#endif 1781#endif
1653 BOOT_PAGESIZE; 1782 BOOT_PAGESIZE;
1654 1783
1655 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV); 1784 irsgv = gv_fetchpv ("/" , GV_ADD|GV_NOTQUAL, SVt_PV);
1656 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO); 1785 stdoutgv = gv_fetchpv ("STDOUT", GV_ADD|GV_NOTQUAL, SVt_PVIO);
… …
1677 main_top_env = main_top_env->je_prev; 1806 main_top_env = main_top_env->je_prev;
1678 1807
1679 coroapi.ver = CORO_API_VERSION; 1808 coroapi.ver = CORO_API_VERSION;
1680 coroapi.rev = CORO_API_REVISION; 1809 coroapi.rev = CORO_API_REVISION;
1681 coroapi.transfer = api_transfer; 1810 coroapi.transfer = api_transfer;
1811
1812 {
1813 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
1814
1815 if (!svp) croak ("Time::HiRes is required");
1816 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
1817
1818 nvtime = INT2PTR (double (*)(), SvIV (*svp));
1819 }
1682 1820
1683 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL)); 1821 assert (("PRIO_NORMAL must be 0", !PRIO_NORMAL));
1684} 1822}
1685 1823
1686SV * 1824SV *
… …
1734 ta.next = 0; 1872 ta.next = 0;
1735 break; 1873 break;
1736 1874
1737 case 1: 1875 case 1:
1738 if (items != 2) 1876 if (items != 2)
1739 croak ("Coro::State::transfer (prev,next) expects two arguments, not %d", items); 1877 croak ("Coro::State::transfer (prev, next) expects two arguments, not %d", items);
1740 1878
1741 prepare_transfer (aTHX_ &ta, ST (0), ST (1)); 1879 prepare_transfer (aTHX_ &ta, ST (0), ST (1));
1742 break; 1880 break;
1743 1881
1744 case 2: 1882 case 2:
… …
1778 _exit (code); 1916 _exit (code);
1779 1917
1780int 1918int
1781cctx_stacksize (int new_stacksize = 0) 1919cctx_stacksize (int new_stacksize = 0)
1782 CODE: 1920 CODE:
1783 RETVAL = coro_stacksize; 1921 RETVAL = cctx_stacksize;
1784 if (new_stacksize) 1922 if (new_stacksize)
1923 {
1785 coro_stacksize = new_stacksize; 1924 cctx_stacksize = new_stacksize;
1925 ++cctx_gen;
1926 }
1927 OUTPUT:
1928 RETVAL
1929
1930int
1931cctx_max_idle (int max_idle = 0)
1932 CODE:
1933 RETVAL = cctx_max_idle;
1934 if (max_idle > 1)
1935 cctx_max_idle = max_idle;
1786 OUTPUT: 1936 OUTPUT:
1787 RETVAL 1937 RETVAL
1788 1938
1789int 1939int
1790cctx_count () 1940cctx_count ()
… …
1814call (Coro::State coro, SV *coderef) 1964call (Coro::State coro, SV *coderef)
1815 ALIAS: 1965 ALIAS:
1816 eval = 1 1966 eval = 1
1817 CODE: 1967 CODE:
1818{ 1968{
1819 if (coro->mainstack) 1969 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
1820 { 1970 {
1821 struct coro temp; 1971 struct coro temp;
1822 1972
1823 if (!(coro->flags & CF_RUNNING)) 1973 if (!(coro->flags & CF_RUNNING))
1824 { 1974 {
… …
1886 CODE: 2036 CODE:
1887 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL; 2037 RETVAL = (coro->cctx ? coro->cctx->flags : 0) & CC_TRACE_ALL;
1888 OUTPUT: 2038 OUTPUT:
1889 RETVAL 2039 RETVAL
1890 2040
1891IV 2041UV
1892rss (Coro::State coro) 2042rss (Coro::State coro)
1893 PROTOTYPE: $ 2043 PROTOTYPE: $
1894 ALIAS: 2044 ALIAS:
1895 usecount = 1 2045 usecount = 1
1896 CODE: 2046 CODE:
… …
1907 CODE: 2057 CODE:
1908 struct coro *coro = SvSTATE (coro_current); 2058 struct coro *coro = SvSTATE (coro_current);
1909 coro->cctx->idle_sp = 0; 2059 coro->cctx->idle_sp = 0;
1910 2060
1911void 2061void
1912throw (Coro::State self, SV *throw = &PL_sv_undef)
1913 PROTOTYPE: $;$
1914 CODE:
1915 SvREFCNT_dec (self->throw);
1916 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
1917
1918void
1919swap_defsv (Coro::State self) 2062swap_defsv (Coro::State self)
1920 PROTOTYPE: $ 2063 PROTOTYPE: $
1921 ALIAS: 2064 ALIAS:
1922 swap_defav = 1 2065 swap_defav = 1
1923 CODE: 2066 CODE:
… …
1977void 2120void
1978_set_current (SV *current) 2121_set_current (SV *current)
1979 PROTOTYPE: $ 2122 PROTOTYPE: $
1980 CODE: 2123 CODE:
1981 SvREFCNT_dec (SvRV (coro_current)); 2124 SvREFCNT_dec (SvRV (coro_current));
1982 SvRV_set (coro_current, SvREFCNT_inc (SvRV (current))); 2125 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
1983 2126
1984void 2127void
1985_set_readyhook (SV *hook) 2128_set_readyhook (SV *hook)
1986 PROTOTYPE: $ 2129 PROTOTYPE: $
1987 CODE: 2130 CODE:
… …
2026 CODE: 2169 CODE:
2027 RETVAL = coro_nready; 2170 RETVAL = coro_nready;
2028 OUTPUT: 2171 OUTPUT:
2029 RETVAL 2172 RETVAL
2030 2173
2174void
2175throw (Coro::State self, SV *throw = &PL_sv_undef)
2176 PROTOTYPE: $;$
2177 CODE:
2178 SvREFCNT_dec (self->throw);
2179 self->throw = SvOK (throw) ? newSVsv (throw) : 0;
2180
2031# for async_pool speedup 2181# for async_pool speedup
2032void 2182void
2033_pool_1 (SV *cb) 2183_pool_1 (SV *cb)
2034 CODE: 2184 CODE:
2035{ 2185{
… …
2047 SvREFCNT_dec (old); 2197 SvREFCNT_dec (old);
2048 croak ("\3async_pool terminate\2\n"); 2198 croak ("\3async_pool terminate\2\n");
2049 } 2199 }
2050 2200
2051 SvREFCNT_dec (coro->saved_deffh); 2201 SvREFCNT_dec (coro->saved_deffh);
2052 coro->saved_deffh = SvREFCNT_inc ((SV *)PL_defoutgv); 2202 coro->saved_deffh = SvREFCNT_inc_NN ((SV *)PL_defoutgv);
2053 2203
2054 hv_store (hv, "desc", sizeof ("desc") - 1, 2204 hv_store (hv, "desc", sizeof ("desc") - 1,
2055 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0); 2205 newSVpvn ("[async_pool]", sizeof ("[async_pool]") - 1), 0);
2056 2206
2057 invoke_av = (AV *)SvRV (invoke); 2207 invoke_av = (AV *)SvRV (invoke);
… …
2061 2211
2062 if (len > 0) 2212 if (len > 0)
2063 { 2213 {
2064 av_fill (defav, len - 1); 2214 av_fill (defav, len - 1);
2065 for (i = 0; i < len; ++i) 2215 for (i = 0; i < len; ++i)
2066 av_store (defav, i, SvREFCNT_inc (AvARRAY (invoke_av)[i + 1])); 2216 av_store (defav, i, SvREFCNT_inc_NN (AvARRAY (invoke_av)[i + 1]));
2067 } 2217 }
2068 2218
2069 SvREFCNT_dec (invoke); 2219 SvREFCNT_dec (invoke);
2070} 2220}
2071 2221
… …
2078 sv_setsv (cb, &PL_sv_undef); 2228 sv_setsv (cb, &PL_sv_undef);
2079 2229
2080 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh; 2230 SvREFCNT_dec ((SV *)PL_defoutgv); PL_defoutgv = (GV *)coro->saved_deffh;
2081 coro->saved_deffh = 0; 2231 coro->saved_deffh = 0;
2082 2232
2083 if (coro_rss (aTHX_ coro) > SvIV (sv_pool_rss) 2233 if (coro_rss (aTHX_ coro) > SvUV (sv_pool_rss)
2084 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size)) 2234 || av_len (av_async_pool) + 1 >= SvIV (sv_pool_size))
2085 { 2235 {
2086 SV *old = PL_diehook; 2236 SV *old = PL_diehook;
2087 PL_diehook = 0; 2237 PL_diehook = 0;
2088 SvREFCNT_dec (old); 2238 SvREFCNT_dec (old);
… …
2150#endif 2300#endif
2151 2301
2152 2302
2153MODULE = Coro::State PACKAGE = Coro::AIO 2303MODULE = Coro::State PACKAGE = Coro::AIO
2154 2304
2155SV * 2305void
2156_get_state () 2306_get_state (SV *self)
2157 CODE: 2307 PPCODE:
2158{ 2308{
2159 struct io_state *data; 2309 AV *defav = GvAV (PL_defgv);
2160 2310 AV *av = newAV ();
2311 int i;
2161 RETVAL = newSV (sizeof (struct io_state)); 2312 SV *data_sv = newSV (sizeof (struct io_state));
2162 data = (struct io_state *)SvPVX (RETVAL); 2313 struct io_state *data = (struct io_state *)SvPVX (data_sv);
2163 SvCUR_set (RETVAL, sizeof (struct io_state)); 2314 SvCUR_set (data_sv, sizeof (struct io_state));
2164 SvPOK_only (RETVAL); 2315 SvPOK_only (data_sv);
2165 2316
2166 data->errorno = errno; 2317 data->errorno = errno;
2167 data->laststype = PL_laststype; 2318 data->laststype = PL_laststype;
2168 data->laststatval = PL_laststatval; 2319 data->laststatval = PL_laststatval;
2169 data->statcache = PL_statcache; 2320 data->statcache = PL_statcache;
2321
2322 av_extend (av, AvFILLp (defav) + 1 + 1);
2323
2324 for (i = 0; i <= AvFILLp (defav); ++i)
2325 av_push (av, SvREFCNT_inc_NN (AvARRAY (defav)[i]));
2326
2327 av_push (av, data_sv);
2328
2329 XPUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
2330
2331 api_ready (self);
2170} 2332}
2171 OUTPUT:
2172 RETVAL
2173 2333
2174void 2334void
2175_set_state (char *data_) 2335_set_state (SV *state)
2176 PROTOTYPE: $ 2336 PROTOTYPE: $
2177 CODE: 2337 PPCODE:
2178{ 2338{
2179 struct io_state *data = (void *)data_; 2339 AV *av = (AV *)SvRV (state);
2340 struct io_state *data = (struct io_state *)SvPVX (AvARRAY (av)[AvFILLp (av)]);
2341 int i;
2180 2342
2181 errno = data->errorno; 2343 errno = data->errorno;
2182 PL_laststype = data->laststype; 2344 PL_laststype = data->laststype;
2183 PL_laststatval = data->laststatval; 2345 PL_laststatval = data->laststatval;
2184 PL_statcache = data->statcache; 2346 PL_statcache = data->statcache;
2347
2348 EXTEND (SP, AvFILLp (av));
2349 for (i = 0; i < AvFILLp (av); ++i)
2350 PUSHs (sv_2mortal (SvREFCNT_inc_NN (AvARRAY (av)[i])));
2185} 2351}
2186 2352
2187 2353
2188MODULE = Coro::State PACKAGE = Coro::AnyEvent 2354MODULE = Coro::State PACKAGE = Coro::AnyEvent
2189 2355
… …
2213 } 2379 }
2214 2380
2215 --incede; 2381 --incede;
2216} 2382}
2217 2383
2384
2385MODULE = Coro::State PACKAGE = PerlIO::cede
2386
2387BOOT:
2388 PerlIO_define_layer (aTHX_ &PerlIO_cede);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines