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.464 by root, Wed Jun 22 22:53:49 2016 UTC vs.
Revision 1.480 by root, Fri Jun 25 01:13:21 2021 UTC

… …
2#define USE_NO_MINGW_SETJMP_TWO_ARGS 2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3 3
4#define NDEBUG 1 /* perl usually disables NDEBUG later */ 4#define NDEBUG 1 /* perl usually disables NDEBUG later */
5 5
6#include "libcoro/coro.c" 6#include "libcoro/coro.c"
7
8#if CORO_UCONTEXT
9 #define CORO_BACKEND "ucontext"
10#elif CORO_SJLJ
11 #define CORO_BACKEND "sjlj"
12#elif CORO_LINUX
13 #define CORO_BACKEND "linux"
14#elif CORO_LOSER
15 #define CORO_BACKEND "loser"
16#elif CORO_FIBER
17 #define CORO_BACKEND "fiber"
18#elif CORO_IRIX
19 #define CORO_BACKEND "irix"
20#elif CORO_ASM
21 #define CORO_BACKEND "asm"
22#elif CORO_PTHREAD
23 #define CORO_BACKEND "pthread"
24#else
25 #define CORO_BACKEND "unknown"
26#endif
7 27
8#define PERL_NO_GET_CONTEXT 28#define PERL_NO_GET_CONTEXT
9#define PERL_EXT 29#define PERL_EXT
10 30
11#include "EXTERN.h" 31#include "EXTERN.h"
… …
116# define CORO_CLOCK_MONOTONIC 1 136# define CORO_CLOCK_MONOTONIC 1
117# define CORO_CLOCK_THREAD_CPUTIME_ID 3 137# define CORO_CLOCK_THREAD_CPUTIME_ID 3
118# endif 138# endif
119#endif 139#endif
120 140
141/* one off bugfix for perl 5.22 */
142#if PERL_VERSION_ATLEAST(5,22,0) && !PERL_VERSION_ATLEAST(5,24,0)
143# undef PadlistNAMES
144# define PadlistNAMES(pl) *((PADNAMELIST **)PadlistARRAY (pl))
145#endif
146
147#if PERL_VERSION_ATLEAST(5,24,0)
148# define SUB_ARGARRAY PL_curpad[0]
149#else
150# define SUB_ARGARRAY (SV *)cx->blk_sub.argarray
151#endif
152
121/* perl usually suppressed asserts. for debugging, we sometimes force it to be on */ 153/* perl usually suppresses asserts. for debugging, we sometimes force it to be on */
122#if 0 154#if 0
123# undef NDEBUG 155# undef NDEBUG
124# include <assert.h> 156# include <assert.h>
125#endif 157#endif
126 158
… …
251 int usecount; /* number of transfers to this coro */ 283 int usecount; /* number of transfers to this coro */
252 284
253 /* coro process data */ 285 /* coro process data */
254 int prio; 286 int prio;
255 SV *except; /* exception to be thrown */ 287 SV *except; /* exception to be thrown */
256 SV *rouse_cb; /* last rouse callback */ 288 SV *rouse_cb; /* most recently created rouse callback */
257 AV *on_destroy; /* callbacks or coros to notify on destroy */ 289 AV *on_destroy; /* callbacks or coros to notify on destroy */
258 AV *status; /* the exit status list */ 290 AV *status; /* the exit status list */
259 291
260 /* async_pool */ 292 /* async_pool */
261 SV *saved_deffh; 293 SV *saved_deffh;
… …
969#endif 1001#endif
970 1002
971 New(54,PL_savestack,24,ANY); 1003 New(54,PL_savestack,24,ANY);
972 PL_savestack_ix = 0; 1004 PL_savestack_ix = 0;
973 PL_savestack_max = 24; 1005 PL_savestack_max = 24;
974#if !PERL_VERSION_ATLEAST (5,24,0) 1006#if PERL_VERSION_ATLEAST (5,24,0)
975 /* perl 5.24 moves SS_MAXPUSH optimisation from */ 1007 /* perl 5.24 moves SS_MAXPUSH optimisation from */
976 /* the header macros to PL_savestack_max */ 1008 /* the header macros to PL_savestack_max */
977 PL_savestack_max -= SS_MAXPUSH; 1009 PL_savestack_max -= SS_MAXPUSH;
978#endif 1010#endif
979 1011
… …
1064static MGVTBL coro_sigelem_vtbl; 1096static MGVTBL coro_sigelem_vtbl;
1065 1097
1066static int ecb_cold 1098static int ecb_cold
1067coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen) 1099coro_sig_copy (pTHX_ SV *sv, MAGIC *mg, SV *nsv, const char *name, I32 namlen)
1068{ 1100{
1101 char *key = SvPV_nolen ((SV *)name);
1102
1103 /* do what mg_copy normally does */
1069 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen); 1104 sv_magic (nsv, mg->mg_obj, PERL_MAGIC_sigelem, name, namlen);
1070 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem); 1105 assert (mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual == &PL_vtbl_sigelem);
1106
1107 /* patch sigelem vtbl, but only for __WARN__ and __DIE__ */
1108 if (*key == '_'
1109 && (strEQ (key, "__DIE__")
1110 || strEQ (key, "__WARN__")))
1071 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl; 1111 mg_find (nsv, PERL_MAGIC_sigelem)->mg_virtual = &coro_sigelem_vtbl;
1112
1072 return 1; 1113 return 1;
1073} 1114}
1074 1115
1075/* perl does not have a %SIG vtbl, we provide one so we can override */ 1116/* perl does not have a %SIG vtbl, we provide one so we can override */
1076/* the cwvtblagic for %SIG members */ 1117/* the magic vtbl for the __DIE__ and __WARN__ members */
1077static const MGVTBL coro_sig_vtbl = { 1118static const MGVTBL coro_sig_vtbl = {
1078 0, 0, 0, 0, 0, 1119 0, 0, 0, 0, 0,
1079 coro_sig_copy 1120 coro_sig_copy
1080}; 1121};
1081 1122
… …
1087 */ 1128 */
1088static int ecb_cold 1129static int ecb_cold
1089coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 1130coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
1090{ 1131{
1091 const char *s = MgPV_nolen_const (mg); 1132 const char *s = MgPV_nolen_const (mg);
1133 /* the key must be either __DIE__ or __WARN__ here */
1134 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1092 1135
1093 if (*s == '_') 1136 SV *ssv;
1094 {
1095 SV **svp = 0;
1096 1137
1097 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1098 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1099
1100 if (svp) 1138 if (!*svp)
1101 {
1102 SV *ssv;
1103
1104 if (!*svp)
1105 ssv = &PL_sv_undef; 1139 ssv = &PL_sv_undef;
1106 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */ 1140 else if (SvTYPE (*svp) == SVt_PVCV) /* perlio directly stores a CV in warnhook. ugh. */
1107 ssv = sv_2mortal (newRV_inc (*svp)); 1141 ssv = sv_2mortal (newRV_inc (*svp));
1108 else 1142 else
1109 ssv = *svp; 1143 ssv = *svp;
1110 1144
1111 sv_setsv (sv, ssv); 1145 sv_setsv (sv, ssv);
1112 return 0; 1146 return 0;
1113 }
1114 }
1115
1116 return PL_vtbl_sigelem.svt_get ? PL_vtbl_sigelem.svt_get (aTHX_ sv, mg) : 0;
1117} 1147}
1118 1148
1119static int ecb_cold 1149static int ecb_cold
1120coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg) 1150coro_sigelem_clr (pTHX_ SV *sv, MAGIC *mg)
1121{ 1151{
1122 const char *s = MgPV_nolen_const (mg); 1152 const char *s = MgPV_nolen_const (mg);
1153 /* the key must be either __DIE__ or __WARN__ here */
1154 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1123 1155
1124 if (*s == '_')
1125 {
1126 SV **svp = 0;
1127
1128 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1129 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1130
1131 if (svp)
1132 {
1133 SV *old = *svp; 1156 SV *old = *svp;
1134 *svp = 0; 1157 *svp = 0;
1135 SvREFCNT_dec (old); 1158 SvREFCNT_dec (old);
1136 return 0; 1159 return 0;
1137 }
1138 }
1139
1140 return PL_vtbl_sigelem.svt_clear ? PL_vtbl_sigelem.svt_clear (aTHX_ sv, mg) : 0;
1141} 1160}
1142 1161
1143static int ecb_cold 1162static int ecb_cold
1144coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg) 1163coro_sigelem_set (pTHX_ SV *sv, MAGIC *mg)
1145{ 1164{
1146 const char *s = MgPV_nolen_const (mg); 1165 const char *s = MgPV_nolen_const (mg);
1166 /* the key must be either __DIE__ or __WARN__ here */
1167 SV **svp = s[2] == 'D' ? &PL_diehook : &PL_warnhook;
1147 1168
1148 if (*s == '_')
1149 {
1150 SV **svp = 0;
1151
1152 if (strEQ (s, "__DIE__" )) svp = &PL_diehook;
1153 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
1154
1155 if (svp)
1156 {
1157 SV *old = *svp; 1169 SV *old = *svp;
1158 *svp = SvOK (sv) ? newSVsv (sv) : 0; 1170 *svp = SvOK (sv) ? newSVsv (sv) : 0;
1159 SvREFCNT_dec (old); 1171 SvREFCNT_dec (old);
1160 return 0; 1172 return 0;
1161 }
1162 }
1163
1164 return PL_vtbl_sigelem.svt_set ? PL_vtbl_sigelem.svt_set (aTHX_ sv, mg) : 0;
1165} 1173}
1166 1174
1167static void 1175static void
1168prepare_nop (pTHX_ struct coro_transfer_args *ta) 1176prepare_nop (pTHX_ struct coro_transfer_args *ta)
1169{ 1177{
… …
1234 myop.op_next = Nullop; 1242 myop.op_next = Nullop;
1235 myop.op_type = OP_ENTERSUB; 1243 myop.op_type = OP_ENTERSUB;
1236 myop.op_flags = OPf_WANT_VOID; 1244 myop.op_flags = OPf_WANT_VOID;
1237 1245
1238 PUSHMARK (SP); 1246 PUSHMARK (SP);
1239 PUSHs ((SV *)coro->startcv); 1247 XPUSHs ((SV *)coro->startcv);
1240 PUTBACK; 1248 PUTBACK;
1241 PL_op = (OP *)&myop; 1249 PL_op = (OP *)&myop;
1242 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 1250 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
1243 } 1251 }
1244 1252
… …
1301 1309
1302 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1310 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1303 1311
1304 save_perl (aTHX_ current); 1312 save_perl (aTHX_ current);
1305 1313
1306 /* this will cause transfer_check to croak on block*/ 1314 /* this will cause transfer_check to croak on block */
1307 SvRV_set (coro_current, (SV *)coro->hv); 1315 SvRV_set (coro_current, (SV *)coro->hv);
1308 1316
1309 load_perl (aTHX_ coro); 1317 load_perl (aTHX_ coro);
1310 1318
1311 /* restore swapped sv's */ 1319 /* restore swapped sv's */
… …
1392 av_push (av, SvREFCNT_inc_NN (*bot++)); 1400 av_push (av, SvREFCNT_inc_NN (*bot++));
1393 1401
1394 PL_runops = RUNOPS_DEFAULT; 1402 PL_runops = RUNOPS_DEFAULT;
1395 ENTER; 1403 ENTER;
1396 SAVETMPS; 1404 SAVETMPS;
1405 PUSHMARK (SP);
1397 EXTEND (SP, 3); 1406 EXTEND (SP, 3);
1398 PUSHMARK (SP);
1399 PUSHs (&PL_sv_no); 1407 PUSHs (&PL_sv_no);
1400 PUSHs (fullname); 1408 PUSHs (fullname);
1401 PUSHs (sv_2mortal (newRV_noinc ((SV *)av))); 1409 PUSHs (sv_2mortal (newRV_noinc ((SV *)av)));
1402 PUTBACK; 1410 PUTBACK;
1403 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1411 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
… …
1430 gv_efullname3 (fullname, gv, 0); 1438 gv_efullname3 (fullname, gv, 0);
1431 1439
1432 PL_runops = RUNOPS_DEFAULT; 1440 PL_runops = RUNOPS_DEFAULT;
1433 ENTER; 1441 ENTER;
1434 SAVETMPS; 1442 SAVETMPS;
1443 PUSHMARK (SP);
1435 EXTEND (SP, 3); 1444 EXTEND (SP, 3);
1436 PUSHMARK (SP);
1437 PUSHs (&PL_sv_yes); 1445 PUSHs (&PL_sv_yes);
1438 PUSHs (fullname); 1446 PUSHs (fullname);
1439 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc ((SV *)cx->blk_sub.argarray)) : &PL_sv_undef); 1447 PUSHs (CxHASARGS (cx) ? sv_2mortal (newRV_inc (SUB_ARGARRAY)) : &PL_sv_undef);
1440 PUTBACK; 1448 PUTBACK;
1441 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0); 1449 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_sub_cb", sizeof ("_trace_sub_cb") - 1, 0);
1442 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1450 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
1443 SPAGAIN; 1451 SPAGAIN;
1444 FREETMPS; 1452 FREETMPS;
… …
1454 dSP; 1462 dSP;
1455 1463
1456 PL_runops = RUNOPS_DEFAULT; 1464 PL_runops = RUNOPS_DEFAULT;
1457 ENTER; 1465 ENTER;
1458 SAVETMPS; 1466 SAVETMPS;
1459 EXTEND (SP, 3);
1460 PL_runops = RUNOPS_DEFAULT;
1461 PUSHMARK (SP); 1467 PUSHMARK (SP);
1468 EXTEND (SP, 2);
1462 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0))); 1469 PUSHs (sv_2mortal (newSVpv (OutCopFILE (oldcop), 0)));
1463 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop)))); 1470 PUSHs (sv_2mortal (newSViv (CopLINE (oldcop))));
1464 PUTBACK; 1471 PUTBACK;
1465 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0); 1472 cb = hv_fetch ((HV *)SvRV (coro_current), "_trace_line_cb", sizeof ("_trace_line_cb") - 1, 0);
1466 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 1473 if (cb) call_sv (*cb, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
… …
1837 1844
1838static int 1845static int
1839coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1846coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1840{ 1847{
1841 struct coro *coro = (struct coro *)mg->mg_ptr; 1848 struct coro *coro = (struct coro *)mg->mg_ptr;
1849
1850 coro_state_destroy (aTHX_ coro);
1842 mg->mg_ptr = 0; 1851 mg->mg_ptr = 0;
1843 1852
1844 coro_state_destroy (aTHX_ coro);
1845 SvREFCNT_dec (coro->on_destroy); 1853 SvREFCNT_dec (coro->on_destroy);
1846 SvREFCNT_dec (coro->status); 1854 SvREFCNT_dec (coro->status);
1847 1855
1848 Safefree (coro); 1856 Safefree (coro);
1849 1857
… …
1852 1860
1853static int ecb_cold 1861static int ecb_cold
1854coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params) 1862coro_state_dup (pTHX_ MAGIC *mg, CLONE_PARAMS *params)
1855{ 1863{
1856 /* called when perl clones the current process the slow way (windows process emulation) */ 1864 /* called when perl clones the current process the slow way (windows process emulation) */
1857 /* WE SIMply nuke the pointers in the copy, causing perl to croak */ 1865 /* we simply nuke the pointers in the copy, causing perl to croak */
1858 mg->mg_ptr = 0; 1866 mg->mg_ptr = 0;
1859 mg->mg_virtual = 0; 1867 mg->mg_virtual = 0;
1860 1868
1861 return 0; 1869 return 0;
1862} 1870}
… …
2384safe_cancel (pTHX_ struct coro *coro, SV **arg, int items) 2392safe_cancel (pTHX_ struct coro *coro, SV **arg, int items)
2385{ 2393{
2386 if (coro->cctx) 2394 if (coro->cctx)
2387 croak ("coro inside C callback, unable to cancel at this time, caught"); 2395 croak ("coro inside C callback, unable to cancel at this time, caught");
2388 2396
2389 if (coro->flags & CF_NEW) 2397 if (coro->flags & (CF_NEW | CF_ZOMBIE))
2390 { 2398 {
2391 coro_set_status (aTHX_ coro, arg, items); 2399 coro_set_status (aTHX_ coro, arg, items);
2392 coro_state_destroy (aTHX_ coro); 2400 coro_state_destroy (aTHX_ coro);
2393 } 2401 }
2394 else 2402 else
… …
2463 av_clear (GvAV (PL_defgv)); 2471 av_clear (GvAV (PL_defgv));
2464 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0); 2472 hv_store (hv, "desc", sizeof ("desc") - 1, SvREFCNT_inc_NN (sv_async_pool_idle), 0);
2465 2473
2466 if (ecb_expect_false (coro->swap_sv)) 2474 if (ecb_expect_false (coro->swap_sv))
2467 { 2475 {
2468 swap_svs_leave (coro); 2476 SWAP_SVS_LEAVE (coro);
2469 SvREFCNT_dec_NN (coro->swap_sv); 2477 SvREFCNT_dec_NN (coro->swap_sv);
2470 coro->swap_sv = 0; 2478 coro->swap_sv = 0;
2471 } 2479 }
2472 2480
2473 coro->prio = 0; 2481 coro->prio = 0;
2474 2482
2475 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE)) 2483 if (ecb_expect_false (coro->cctx) && ecb_expect_false (coro->cctx->flags & CC_TRACE))
2476 api_trace (aTHX_ coro_current, 0); 2484 api_trace (aTHX_ coro_current, 0);
2477 2485
2478 frame->prepare = prepare_schedule; 2486 frame->prepare = prepare_schedule;
2479 av_push (av_async_pool, SvREFCNT_inc (hv)); 2487 av_push (av_async_pool, SvREFCNT_inc_NN (hv));
2480 } 2488 }
2481 } 2489 }
2482 else 2490 else
2483 { 2491 {
2484 /* first iteration, simply fall through */ 2492 /* first iteration, simply fall through */
… …
2497static void 2505static void
2498coro_rouse_callback (pTHX_ CV *cv) 2506coro_rouse_callback (pTHX_ CV *cv)
2499{ 2507{
2500 dXSARGS; 2508 dXSARGS;
2501 SV *data = (SV *)S_GENSUB_ARG; 2509 SV *data = (SV *)S_GENSUB_ARG;
2510 SV *coro = SvRV (data);
2502 2511
2512 /* data starts being either undef or a coro, and is replaced by the results when done */
2503 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2513 if (SvTYPE (coro) != SVt_PVAV)
2504 { 2514 {
2505 /* first call, set args */ 2515 /* first call, set args */
2506 SV *coro = SvRV (data);
2507 AV *av = newAV ();
2508 2516
2509 SvRV_set (data, (SV *)av); 2517 assert (&ST (0) < &ST (1)); /* ensure the stack is in the order we expect it to be */
2518 SvRV_set (data, (SV *)av_make (items, &ST (0))); /* av_make copies the SVs */
2510 2519
2511 /* better take a full copy of the arguments */ 2520 if (coro != &PL_sv_undef)
2512 while (items--) 2521 {
2513 av_store (av, items, newSVsv (ST (items)));
2514
2515 api_ready (aTHX_ coro); 2522 api_ready (aTHX_ coro);
2516 SvREFCNT_dec (coro); 2523 SvREFCNT_dec_NN (coro);
2524 }
2517 } 2525 }
2518 2526
2519 XSRETURN_EMPTY; 2527 XSRETURN_EMPTY;
2520} 2528}
2521 2529
… …
2538 2546
2539 EXTEND (SP, AvFILLp (av) + 1); 2547 EXTEND (SP, AvFILLp (av) + 1);
2540 for (i = 0; i <= AvFILLp (av); ++i) 2548 for (i = 0; i <= AvFILLp (av); ++i)
2541 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2549 PUSHs (sv_2mortal (AvARRAY (av)[i]));
2542 2550
2543 /* we have stolen the elements, so set length to zero and free */ 2551 /* we have stolen the elements, make it unreal and free */
2544 AvFILLp (av) = -1; 2552 AvREAL_off (av);
2545 av_undef (av); 2553 av_undef (av);
2546 2554
2547 PUTBACK; 2555 PUTBACK;
2548 } 2556 }
2549 2557
… …
2574 croak ("Coro::rouse_wait called with illegal callback argument,"); 2582 croak ("Coro::rouse_wait called with illegal callback argument,");
2575 2583
2576 { 2584 {
2577 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */ 2585 CV *cv = (CV *)SvRV (cb); /* for S_GENSUB_ARG */
2578 SV *data = (SV *)S_GENSUB_ARG; 2586 SV *data = (SV *)S_GENSUB_ARG;
2587 int data_ready = SvTYPE (SvRV (data)) == SVt_PVAV;
2588
2589 /* if there is no data, we need to store the current coro in the reference so we can be woken up */
2590 if (!data_ready)
2591 if (SvRV (data) != &PL_sv_undef)
2592 croak ("Coro::rouse_wait was called on a calback that is already being waited for - only one thread can wait for a rouse callback, caught");
2593 else
2594 SvRV_set (data, SvREFCNT_inc_NN (SvRV (coro_current)));
2579 2595
2580 frame->data = (void *)data; 2596 frame->data = (void *)data;
2581 frame->prepare = SvTYPE (SvRV (data)) == SVt_PVAV ? prepare_nop : prepare_schedule; 2597 frame->prepare = data_ready ? prepare_nop : prepare_schedule;
2582 frame->check = slf_check_rouse_wait; 2598 frame->check = slf_check_rouse_wait;
2583 } 2599 }
2584} 2600}
2585 2601
2586static SV * 2602static SV *
2587coro_new_rouse_cb (pTHX) 2603coro_new_rouse_cb (pTHX)
2588{ 2604{
2589 HV *hv = (HV *)SvRV (coro_current); 2605 HV *hv = (HV *)SvRV (coro_current);
2590 struct coro *coro = SvSTATE_hv (hv); 2606 struct coro *coro = SvSTATE_hv (hv);
2591 SV *data = newRV_inc ((SV *)hv); 2607 SV *data = newRV_noinc (&PL_sv_undef);
2592 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data); 2608 SV *cb = s_gensub (aTHX_ coro_rouse_callback, (void *)data);
2593 2609
2594 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0); 2610 sv_magicext (SvRV (cb), data, CORO_MAGIC_type_rouse, 0, 0, 0);
2595 SvREFCNT_dec (data); /* magicext increases the refcount */ 2611 SvREFCNT_dec_NN (data); /* magicext increases the refcount */
2596 2612
2597 SvREFCNT_dec (coro->rouse_cb); 2613 SvREFCNT_dec (coro->rouse_cb);
2598 coro->rouse_cb = SvREFCNT_inc_NN (cb); 2614 coro->rouse_cb = SvREFCNT_inc_NN (cb);
2599 2615
2600 return cb; 2616 return cb;
… …
3609 3625
3610 map_len = load_len + save_len + 16; 3626 map_len = load_len + save_len + 16;
3611 3627
3612 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); 3628 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE | PROT_EXEC, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3613 3629
3630 if (map_base == (char *)MAP_FAILED)
3631 map_base = mmap (0, map_len, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
3632
3614 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED)); 3633 assert (("Coro: unable to mmap jit code page, cannot continue.", map_base != (char *)MAP_FAILED));
3615 3634
3616 load_perl_slots = (load_save_perl_slots_type)map_base; 3635 load_perl_slots = (load_save_perl_slots_type)map_base;
3617 memcpy (map_base, load_ptr, load_len); 3636 memcpy (map_base, load_ptr, load_len);
3618 3637
… …
3684 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV)); 3703 rv_diehook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::diehook" , 0, SVt_PVCV));
3685 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV)); 3704 rv_warnhook = newRV_inc ((SV *)gv_fetchpv ("Coro::State::warnhook", 0, SVt_PVCV));
3686 3705
3687 coro_state_stash = gv_stashpv ("Coro::State", TRUE); 3706 coro_state_stash = gv_stashpv ("Coro::State", TRUE);
3688 3707
3708 newCONSTSUB (coro_state_stash, "BACKEND", newSVpv (CORO_BACKEND, 0)); /* undocumented */
3709
3689 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE)); 3710 newCONSTSUB (coro_state_stash, "CC_TRACE" , newSViv (CC_TRACE));
3690 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB)); 3711 newCONSTSUB (coro_state_stash, "CC_TRACE_SUB" , newSViv (CC_TRACE_SUB));
3691 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE)); 3712 newCONSTSUB (coro_state_stash, "CC_TRACE_LINE", newSViv (CC_TRACE_LINE));
3692 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL)); 3713 newCONSTSUB (coro_state_stash, "CC_TRACE_ALL" , newSViv (CC_TRACE_ALL));
3693 3714
… …
3817call (Coro::State coro, SV *coderef) 3838call (Coro::State coro, SV *coderef)
3818 ALIAS: 3839 ALIAS:
3819 eval = 1 3840 eval = 1
3820 CODE: 3841 CODE:
3821{ 3842{
3843 struct coro *current = SvSTATE_current;
3844
3822 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3845 if ((coro == current) || (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)))
3823 { 3846 {
3824 struct coro *current = SvSTATE_current;
3825 struct CoroSLF slf_save; 3847 struct CoroSLF slf_save;
3826 3848
3827 if (current != coro) 3849 if (current != coro)
3828 { 3850 {
3829 PUTBACK; 3851 PUTBACK;
… …
4088 coroapi.enterleave_hook = api_enterleave_hook; 4110 coroapi.enterleave_hook = api_enterleave_hook;
4089 coroapi.enterleave_unhook = api_enterleave_unhook; 4111 coroapi.enterleave_unhook = api_enterleave_unhook;
4090 coroapi.enterleave_scope_hook = api_enterleave_scope_hook; 4112 coroapi.enterleave_scope_hook = api_enterleave_scope_hook;
4091 4113
4092 /*GCoroAPI = &coroapi;*/ 4114 /*GCoroAPI = &coroapi;*/
4093 sv_setiv (sv, (IV)&coroapi); 4115 sv_setiv (sv, PTR2IV (&coroapi));
4094 SvREADONLY_on (sv); 4116 SvREADONLY_on (sv);
4095 } 4117 }
4096} 4118}
4097 4119
4098SV * 4120SV *

Diff Legend

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