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.372 by root, Thu Oct 1 23:50:23 2009 UTC vs.
Revision 1.396 by root, Fri May 6 18:01:13 2011 UTC

1/* this works around a bug in mingw32 providing a non-working setjmp */
2#define USE_NO_MINGW_SETJMP_TWO_ARGS
3
4#define NDEBUG 1
5
1#include "libcoro/coro.c" 6#include "libcoro/coro.c"
2 7
3#define PERL_NO_GET_CONTEXT 8#define PERL_NO_GET_CONTEXT
4#define PERL_EXT 9#define PERL_EXT
5 10
… …
12 17
13#include <stdio.h> 18#include <stdio.h>
14#include <errno.h> 19#include <errno.h>
15#include <assert.h> 20#include <assert.h>
16 21
17#ifdef WIN32 22#ifndef SVs_PADSTALE
23# define SVs_PADSTALE 0
24#endif
25
26#if defined(_WIN32)
27# undef HAS_GETTIMEOFDAY
18# undef setjmp 28# undef setjmp
19# undef longjmp 29# undef longjmp
20# undef _exit 30# undef _exit
21# define setjmp _setjmp /* deep magic */ 31# define setjmp _setjmp /* deep magic */
22#else 32#else
… …
186 int valgrind_id; 196 int valgrind_id;
187#endif 197#endif
188 unsigned char flags; 198 unsigned char flags;
189} coro_cctx; 199} coro_cctx;
190 200
191coro_cctx *cctx_current; /* the currently running cctx */ 201static coro_cctx *cctx_current; /* the currently running cctx */
192 202
193/*****************************************************************************/ 203/*****************************************************************************/
194 204
195enum { 205enum {
196 CF_RUNNING = 0x0001, /* coroutine is running */ 206 CF_RUNNING = 0x0001, /* coroutine is running */
197 CF_READY = 0x0002, /* coroutine is ready */ 207 CF_READY = 0x0002, /* coroutine is ready */
198 CF_NEW = 0x0004, /* has never been switched to */ 208 CF_NEW = 0x0004, /* has never been switched to */
199 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
200 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */ 210 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
211 CF_NOCANCEL = 0x0020, /* cannot cancel, set slf_frame.data to 1 (hackish) */
201}; 212};
202 213
203/* the structure where most of the perl state is stored, overlaid on the cxstack */ 214/* the structure where most of the perl state is stored, overlaid on the cxstack */
204typedef struct 215typedef struct
205{ 216{
… …
231 CV *startcv; /* the CV to execute */ 242 CV *startcv; /* the CV to execute */
232 AV *args; /* data associated with this coroutine (initial args) */ 243 AV *args; /* data associated with this coroutine (initial args) */
233 int refcnt; /* coroutines are refcounted, yes */ 244 int refcnt; /* coroutines are refcounted, yes */
234 int flags; /* CF_ flags */ 245 int flags; /* CF_ flags */
235 HV *hv; /* the perl hash associated with this coro, if any */ 246 HV *hv; /* the perl hash associated with this coro, if any */
236 void (*on_destroy)(pTHX_ struct coro *coro); 247 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
237 248
238 /* statistics */ 249 /* statistics */
239 int usecount; /* number of transfers to this coro */ 250 int usecount; /* number of transfers to this coro */
240 251
241 /* coro process data */ 252 /* coro process data */
… …
250 261
251 /* on_enter/on_leave */ 262 /* on_enter/on_leave */
252 AV *on_enter; 263 AV *on_enter;
253 AV *on_leave; 264 AV *on_leave;
254 265
266 /* swap_sv */
267 AV *swap_sv;
268
255 /* times */ 269 /* times */
256 coro_ts t_cpu, t_real; 270 coro_ts t_cpu, t_real;
257 271
258 /* linked list */ 272 /* linked list */
259 struct coro *next, *prev; 273 struct coro *next, *prev;
… …
262typedef struct coro *Coro__State; 276typedef struct coro *Coro__State;
263typedef struct coro *Coro__State_or_hashref; 277typedef struct coro *Coro__State_or_hashref;
264 278
265/* the following variables are effectively part of the perl context */ 279/* the following variables are effectively part of the perl context */
266/* and get copied between struct coro and these variables */ 280/* and get copied between struct coro and these variables */
267/* the mainr easonw e don't support windows process emulation */ 281/* the main reason we don't support windows process emulation */
268static struct CoroSLF slf_frame; /* the current slf frame */ 282static struct CoroSLF slf_frame; /* the current slf frame */
269 283
270/** Coro ********************************************************************/ 284/** Coro ********************************************************************/
271 285
272#define CORO_PRIO_MAX 3 286#define CORO_PRIO_MAX 3
… …
301 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */ 315 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
302 PL_op->op_flags |= OPf_STACKED; 316 PL_op->op_flags |= OPf_STACKED;
303 PL_op->op_private = 0; 317 PL_op->op_private = 0;
304 return PL_ppaddr [OP_ENTERSUB](aTHX); 318 return PL_ppaddr [OP_ENTERSUB](aTHX);
305} 319}
320
321/** time stuff **************************************************************/
322
323#ifdef HAS_GETTIMEOFDAY
324
325static void
326coro_u2time (pTHX_ UV ret[2])
327{
328 struct timeval tv;
329 gettimeofday (&tv, 0);
330
331 ret [0] = tv.tv_sec;
332 ret [1] = tv.tv_usec;
333}
334
335static double
336coro_nvtime ()
337{
338 struct timeval tv;
339 gettimeofday (&tv, 0);
340
341 return tv.tv_sec + tv.tv_usec * 1e-6;
342}
343
344static void
345time_init (pTHX)
346{
347 nvtime = coro_nvtime;
348 u2time = coro_u2time;
349}
350
351#else
352
353static void
354time_init (pTHX)
355{
356 SV **svp;
357
358 require_pv ("Time/HiRes.pm");
359
360 svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
361
362 if (!svp) croak ("Time::HiRes is required, but missing. Caught");
363 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer. Caught");
364
365 nvtime = INT2PTR (double (*)(), SvIV (*svp));
366
367 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
368 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
369}
370
371#endif
306 372
307/** lowlevel stuff **********************************************************/ 373/** lowlevel stuff **********************************************************/
308 374
309static SV * 375static SV *
310coro_get_sv (pTHX_ const char *name, int create) 376coro_get_sv (pTHX_ const char *name, int create)
… …
550 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
551} 617}
552 618
553/** load & save, init *******************************************************/ 619/** load & save, init *******************************************************/
554 620
621/* swap sv heads, at least logically */
622static void
623swap_svs (pTHX_ Coro__State c)
624{
625 int i;
626
627 for (i = 0; i <= AvFILLp (c->swap_sv); )
628 {
629 SV *a = AvARRAY (c->swap_sv)[i++];
630 SV *b = AvARRAY (c->swap_sv)[i++];
631
632 const U32 keep = SVs_PADSTALE | SVs_PADTMP | SVs_PADMY; /* keep these flags */
633 SV tmp;
634
635 /* swap sv_any */
636 SvANY (&tmp) = SvANY (a); SvANY (a) = SvANY (b); SvANY (b) = SvANY (&tmp);
637
638 /* swap sv_flags */
639 SvFLAGS (&tmp) = SvFLAGS (a);
640 SvFLAGS (a) = (SvFLAGS (a) & keep) | (SvFLAGS (b ) & ~keep);
641 SvFLAGS (b) = (SvFLAGS (b) & keep) | (SvFLAGS (&tmp) & ~keep);
642
643#if PERL_VERSION_ATLEAST (5,10,0)
644 /* perl 5.10 complicates this _quite_ a bit, but it also is
645 * much faster, so no quarrels here. alternatively, we could
646 * sv_upgrade to avoid this.
647 */
648 {
649 /* swap sv_u */
650 tmp.sv_u = a->sv_u; a->sv_u = b->sv_u; b->sv_u = tmp.sv_u;
651
652 /* if SvANY points to the head, we need to adjust the pointers,
653 * as the pointer for a still points to b, and maybe vice versa.
654 */
655 #define svany_in_head(type) \
656 (((1 << SVt_NULL) | (1 << SVt_BIND) | (1 << SVt_IV) | (1 << SVt_RV)) & (1 << (type)))
657
658 if (svany_in_head (SvTYPE (a)))
659 SvANY (a) = (void *)((PTRV)SvANY (a) - (PTRV)b + (PTRV)a);
660
661 if (svany_in_head (SvTYPE (b)))
662 SvANY (b) = (void *)((PTRV)SvANY (b) - (PTRV)a + (PTRV)b);
663 }
664#endif
665 }
666}
667
668#define SWAP_SVS(coro) \
669 if (expect_false ((coro)->swap_sv)) \
670 swap_svs (aTHX_ (coro))
671
555static void 672static void
556on_enterleave_call (pTHX_ SV *cb); 673on_enterleave_call (pTHX_ SV *cb);
557 674
558static void 675static void
559load_perl (pTHX_ Coro__State c) 676load_perl (pTHX_ Coro__State c)
… …
605 int i; 722 int i;
606 723
607 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 724 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
608 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
609 } 726 }
727
728 SWAP_SVS (c);
610} 729}
611 730
612static void 731static void
613save_perl (pTHX_ Coro__State c) 732save_perl (pTHX_ Coro__State c)
614{ 733{
734 SWAP_SVS (c);
735
615 if (expect_false (c->on_leave)) 736 if (expect_false (c->on_leave))
616 { 737 {
617 int i; 738 int i;
618 739
619 for (i = AvFILLp (c->on_leave); i >= 0; --i) 740 for (i = AvFILLp (c->on_leave); i >= 0; --i)
… …
926slf_check_repeat (pTHX_ struct CoroSLF *frame) 1047slf_check_repeat (pTHX_ struct CoroSLF *frame)
927{ 1048{
928 return 1; 1049 return 1;
929} 1050}
930 1051
931static UNOP coro_setup_op; 1052static UNOP init_perl_op;
932 1053
933static void NOINLINE /* noinline to keep it out of the transfer fast path */ 1054static void NOINLINE /* noinline to keep it out of the transfer fast path */
934coro_setup (pTHX_ struct coro *coro) 1055init_perl (pTHX_ struct coro *coro)
935{ 1056{
936 /* 1057 /*
937 * emulate part of the perl startup here. 1058 * emulate part of the perl startup here.
938 */ 1059 */
939 coro_init_stacks (aTHX); 1060 coro_init_stacks (aTHX);
… …
946 PL_comppad_name_fill = 0; 1067 PL_comppad_name_fill = 0;
947 PL_comppad_name_floor = 0; 1068 PL_comppad_name_floor = 0;
948 PL_curpm = 0; 1069 PL_curpm = 0;
949 PL_curpad = 0; 1070 PL_curpad = 0;
950 PL_localizing = 0; 1071 PL_localizing = 0;
951 PL_dirty = 0;
952 PL_restartop = 0; 1072 PL_restartop = 0;
953#if PERL_VERSION_ATLEAST (5,10,0) 1073#if PERL_VERSION_ATLEAST (5,10,0)
954 PL_parser = 0; 1074 PL_parser = 0;
955#endif 1075#endif
956 PL_hints = 0; 1076 PL_hints = 0;
… …
988 */ 1108 */
989 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */ 1109 slf_frame.prepare = prepare_nop; /* provide a nop function for an eventual pp_slf */
990 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */ 1110 slf_frame.check = slf_check_nop; /* signal pp_slf to not repeat */
991 1111
992 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */ 1112 /* and we have to provide the pp_slf op in any case, so pp_slf can skip it */
993 coro_setup_op.op_next = PL_op; 1113 init_perl_op.op_next = PL_op;
994 coro_setup_op.op_type = OP_ENTERSUB; 1114 init_perl_op.op_type = OP_ENTERSUB;
995 coro_setup_op.op_ppaddr = pp_slf; 1115 init_perl_op.op_ppaddr = pp_slf;
996 /* no flags etc. required, as an init function won't be called */ 1116 /* no flags etc. required, as an init function won't be called */
997 1117
998 PL_op = (OP *)&coro_setup_op; 1118 PL_op = (OP *)&init_perl_op;
999 1119
1000 /* copy throw, in case it was set before coro_setup */ 1120 /* copy throw, in case it was set before init_perl */
1001 CORO_THROW = coro->except; 1121 CORO_THROW = coro->except;
1122
1123 SWAP_SVS (coro);
1002 1124
1003 if (expect_false (enable_times)) 1125 if (expect_false (enable_times))
1004 { 1126 {
1005 coro_times_update (); 1127 coro_times_update ();
1006 coro_times_sub (coro); 1128 coro_times_sub (coro);
… …
1027 dounwind (-1); 1149 dounwind (-1);
1028 } 1150 }
1029} 1151}
1030 1152
1031static void 1153static void
1032coro_destruct_perl (pTHX_ struct coro *coro) 1154destroy_perl (pTHX_ struct coro *coro)
1033{ 1155{
1034 SV *svf [9]; 1156 SV *svf [9];
1035 1157
1036 { 1158 {
1037 struct coro *current = SvSTATE_current; 1159 struct coro *current = SvSTATE_current;
1038 1160
1039 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack)); 1161 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1040 1162
1041 save_perl (aTHX_ current); 1163 save_perl (aTHX_ current);
1164 SvRV_set (coro_current, (SV *)coro->hv); /* this will cause acroak in transfer_check */
1042 load_perl (aTHX_ coro); 1165 load_perl (aTHX_ coro);
1043 1166
1044 coro_unwind_stacks (aTHX); 1167 coro_unwind_stacks (aTHX);
1045 coro_destruct_stacks (aTHX); 1168 coro_destruct_stacks (aTHX);
1169
1170 /* restore swapped sv's */
1171 SWAP_SVS (coro);
1046 1172
1047 // now save some sv's to be free'd later 1173 // now save some sv's to be free'd later
1048 svf [0] = GvSV (PL_defgv); 1174 svf [0] = GvSV (PL_defgv);
1049 svf [1] = (SV *)GvAV (PL_defgv); 1175 svf [1] = (SV *)GvAV (PL_defgv);
1050 svf [2] = GvSV (PL_errgv); 1176 svf [2] = GvSV (PL_errgv);
… …
1054 svf [6] = (SV *)GvHV (PL_hintgv); 1180 svf [6] = (SV *)GvHV (PL_hintgv);
1055 svf [7] = PL_diehook; 1181 svf [7] = PL_diehook;
1056 svf [8] = PL_warnhook; 1182 svf [8] = PL_warnhook;
1057 assert (9 == sizeof (svf) / sizeof (*svf)); 1183 assert (9 == sizeof (svf) / sizeof (*svf));
1058 1184
1185 SvRV_set (coro_current, (SV *)current->hv);
1059 load_perl (aTHX_ current); 1186 load_perl (aTHX_ current);
1060 } 1187 }
1061 1188
1062 { 1189 {
1063 unsigned int i; 1190 unsigned int i;
… …
1372cctx_destroy (coro_cctx *cctx) 1499cctx_destroy (coro_cctx *cctx)
1373{ 1500{
1374 if (!cctx) 1501 if (!cctx)
1375 return; 1502 return;
1376 1503
1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1504 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1378 1505
1379 --cctx_count; 1506 --cctx_count;
1380 coro_destroy (&cctx->cctx); 1507 coro_destroy (&cctx->cctx);
1381 1508
1382 /* coro_transfer creates new, empty cctx's */ 1509 /* coro_transfer creates new, empty cctx's */
… …
1492 if (expect_false (next->flags & CF_NEW)) 1619 if (expect_false (next->flags & CF_NEW))
1493 { 1620 {
1494 /* need to start coroutine */ 1621 /* need to start coroutine */
1495 next->flags &= ~CF_NEW; 1622 next->flags &= ~CF_NEW;
1496 /* setup coroutine call */ 1623 /* setup coroutine call */
1497 coro_setup (aTHX_ next); 1624 init_perl (aTHX_ next);
1498 } 1625 }
1499 else 1626 else
1500 load_perl (aTHX_ next); 1627 load_perl (aTHX_ next);
1501 1628
1502 /* possibly untie and reuse the cctx */ 1629 /* possibly untie and reuse the cctx */
… …
1541#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1668#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1542#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1669#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1543 1670
1544/** high level stuff ********************************************************/ 1671/** high level stuff ********************************************************/
1545 1672
1546static int 1673static void
1547coro_state_destroy (pTHX_ struct coro *coro) 1674coro_state_destroy (pTHX_ struct coro *coro)
1548{ 1675{
1549 if (coro->flags & CF_DESTROYED) 1676 if (coro->flags & CF_DESTROYED)
1550 return 0; 1677 return;
1551 1678
1679 /* this callback is reserved for slf functions needing to do cleanup */
1552 if (coro->on_destroy && !PL_dirty) 1680 if (coro->on_destroy && !PL_dirty)
1553 coro->on_destroy (aTHX_ coro); 1681 coro->on_destroy (aTHX_ coro);
1682
1683 /*
1684 * The on_destroy above most likely is from an SLF call.
1685 * Since by definition the SLF call will not finish when we destroy
1686 * the coro, we will have to force-finish it here, otherwise
1687 * cleanup functions cannot call SLF functions.
1688 */
1689 coro->slf_frame.prepare = 0;
1554 1690
1555 coro->flags |= CF_DESTROYED; 1691 coro->flags |= CF_DESTROYED;
1556 1692
1557 if (coro->flags & CF_READY) 1693 if (coro->flags & CF_READY)
1558 { 1694 {
… …
1565 1701
1566 if (coro->mainstack 1702 if (coro->mainstack
1567 && coro->mainstack != main_mainstack 1703 && coro->mainstack != main_mainstack
1568 && coro->slot 1704 && coro->slot
1569 && !PL_dirty) 1705 && !PL_dirty)
1570 coro_destruct_perl (aTHX_ coro); 1706 destroy_perl (aTHX_ coro);
1707
1708 if (coro->next) coro->next->prev = coro->prev;
1709 if (coro->prev) coro->prev->next = coro->next;
1710 if (coro == coro_first) coro_first = coro->next;
1571 1711
1572 cctx_destroy (coro->cctx); 1712 cctx_destroy (coro->cctx);
1573 SvREFCNT_dec (coro->startcv); 1713 SvREFCNT_dec (coro->startcv);
1574 SvREFCNT_dec (coro->args); 1714 SvREFCNT_dec (coro->args);
1715 SvREFCNT_dec (coro->swap_sv);
1575 SvREFCNT_dec (CORO_THROW); 1716 SvREFCNT_dec (CORO_THROW);
1576
1577 if (coro->next) coro->next->prev = coro->prev;
1578 if (coro->prev) coro->prev->next = coro->next;
1579 if (coro == coro_first) coro_first = coro->next;
1580
1581 return 1;
1582} 1717}
1583 1718
1584static int 1719static int
1585coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1720coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1586{ 1721{
… …
1754 { 1889 {
1755 /* nothing to schedule: call the idle handler */ 1890 /* nothing to schedule: call the idle handler */
1756 if (SvROK (sv_idle) 1891 if (SvROK (sv_idle)
1757 && SvOBJECT (SvRV (sv_idle))) 1892 && SvOBJECT (SvRV (sv_idle)))
1758 { 1893 {
1894 if (SvRV (sv_idle) == SvRV (coro_current))
1895 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1896
1759 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1897 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1760 api_ready (aTHX_ SvRV (sv_idle)); 1898 api_ready (aTHX_ SvRV (sv_idle));
1761 --coro_nready; 1899 --coro_nready;
1762 } 1900 }
1763 else 1901 else
… …
1880 2018
1881static void 2019static void
1882coro_call_on_destroy (pTHX_ struct coro *coro) 2020coro_call_on_destroy (pTHX_ struct coro *coro)
1883{ 2021{
1884 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2022 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0);
1885 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
1886 2023
1887 if (on_destroyp) 2024 if (on_destroyp)
1888 { 2025 {
1889 AV *on_destroy = (AV *)SvRV (*on_destroyp); 2026 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2027 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2028 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
1890 2029
1891 while (AvFILLp (on_destroy) >= 0) 2030 while (AvFILLp (on_destroy) >= 0)
1892 { 2031 {
1893 dSP; /* don't disturb outer sp */ 2032 dSP; /* don't disturb outer sp */
1894 SV *cb = av_pop (on_destroy); 2033 SV *cb = av_pop (on_destroy);
… …
1896 PUSHMARK (SP); 2035 PUSHMARK (SP);
1897 2036
1898 if (statusp) 2037 if (statusp)
1899 { 2038 {
1900 int i; 2039 int i;
1901 AV *status = (AV *)SvRV (*statusp);
1902 EXTEND (SP, AvFILLp (status) + 1); 2040 EXTEND (SP, AvFILLp (status) + 1);
1903 2041
1904 for (i = 0; i <= AvFILLp (status); ++i) 2042 for (i = 0; i <= AvFILLp (status); ++i)
1905 PUSHs (AvARRAY (status)[i]); 2043 PUSHs (AvARRAY (status)[i]);
1906 } 2044 }
… …
1910 } 2048 }
1911 } 2049 }
1912} 2050}
1913 2051
1914static void 2052static void
1915slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2053coro_set_status (HV *coro_hv, SV **arg, int items)
1916{ 2054{
1917 int i;
1918 HV *hv = (HV *)SvRV (coro_current);
1919 AV *av = newAV (); 2055 AV *av = newAV ();
1920 2056
1921 /* items are actually not so common, so optimise for this case */ 2057 /* items are actually not so common, so optimise for this case */
1922 if (items) 2058 if (items)
1923 { 2059 {
2060 int i;
2061
1924 av_extend (av, items - 1); 2062 av_extend (av, items - 1);
1925 2063
1926 for (i = 0; i < items; ++i) 2064 for (i = 0; i < items; ++i)
1927 av_push (av, SvREFCNT_inc_NN (arg [i])); 2065 av_push (av, SvREFCNT_inc_NN (arg [i]));
1928 } 2066 }
1929 2067
1930 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2068 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2069}
1931 2070
2071static void
2072slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2073{
1932 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2074 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1933 api_ready (aTHX_ sv_manager); 2075 api_ready (aTHX_ sv_manager);
1934 2076
1935 frame->prepare = prepare_schedule; 2077 frame->prepare = prepare_schedule;
1936 frame->check = slf_check_repeat; 2078 frame->check = slf_check_repeat;
1937 2079
1938 /* as a minor optimisation, we could unwind all stacks here */ 2080 /* as a minor optimisation, we could unwind all stacks here */
1939 /* but that puts extra pressure on pp_slf, and is not worth much */ 2081 /* but that puts extra pressure on pp_slf, and is not worth much */
1940 /*coro_unwind_stacks (aTHX);*/ 2082 /*coro_unwind_stacks (aTHX);*/
2083}
2084
2085static void
2086slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2087{
2088 HV *coro_hv = (HV *)SvRV (coro_current);
2089
2090 coro_set_status (coro_hv, arg, items);
2091 slf_init_terminate_cancel_common (frame, coro_hv);
2092}
2093
2094static void
2095slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2096{
2097 HV *coro_hv;
2098 struct coro *coro;
2099
2100 if (items <= 0)
2101 croak ("Coro::cancel called without coro object,");
2102
2103 coro = SvSTATE (arg [0]);
2104 coro_hv = coro->hv;
2105
2106 coro_set_status (coro_hv, arg + 1, items - 1);
2107
2108 if (expect_false (coro->flags & CF_NOCANCEL))
2109 {
2110 /* coro currently busy cancelling something, so just notify it */
2111 coro->slf_frame.data = (void *)coro;
2112
2113 frame->prepare = prepare_nop;
2114 frame->check = slf_check_nop;
2115 }
2116 else if (coro_hv == (HV *)SvRV (coro_current))
2117 {
2118 /* cancelling the current coro is allowed, and equals terminate */
2119 slf_init_terminate_cancel_common (frame, coro_hv);
2120 }
2121 else
2122 {
2123 struct coro *self = SvSTATE_current;
2124
2125 /* otherwise we cancel directly, purely for speed reasons
2126 * unfortunately, this requires some magic trickery, as
2127 * somebody else could cancel us, so we have to fight the cancellation.
2128 * this is ugly, and hopefully fully worth the extra speed.
2129 * besides, I can't get the slow-but-safe version working...
2130 */
2131 slf_frame.data = 0;
2132 self->flags |= CF_NOCANCEL;
2133
2134 coro_state_destroy (aTHX_ coro);
2135 coro_call_on_destroy (aTHX_ coro);
2136
2137 self->flags &= ~CF_NOCANCEL;
2138
2139 if (slf_frame.data)
2140 {
2141 /* while we were busy we have been cancelled, so terminate */
2142 slf_init_terminate_cancel_common (frame, self->hv);
2143 }
2144 else
2145 {
2146 frame->prepare = prepare_nop;
2147 frame->check = slf_check_nop;
2148 }
2149 }
1941} 2150}
1942 2151
1943/*****************************************************************************/ 2152/*****************************************************************************/
1944/* async pool handler */ 2153/* async pool handler */
1945 2154
… …
2331 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB] 2540 if (PL_op->op_ppaddr != PL_ppaddr [OP_ENTERSUB]
2332 && PL_op->op_ppaddr != pp_slf) 2541 && PL_op->op_ppaddr != pp_slf)
2333 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught"); 2542 croak ("FATAL: Coro SLF calls can only be made normally, not via goto or any other means, caught");
2334 2543
2335 CvFLAGS (cv) |= CVf_SLF; 2544 CvFLAGS (cv) |= CVf_SLF;
2336 CvNODEBUG_on (cv);
2337 CvXSUBANY (cv).any_ptr = (void *)init_cb; 2545 CvXSUBANY (cv).any_ptr = (void *)init_cb;
2338 slf_cv = cv; 2546 slf_cv = cv;
2339 2547
2340 /* we patch the op, and then re-run the whole call */ 2548 /* we patch the op, and then re-run the whole call */
2341 /* we have to put the same argument on the stack for this to work */ 2549 /* we have to put the same argument on the stack for this to work */
… …
2350 if (PL_op->op_flags & OPf_STACKED) 2558 if (PL_op->op_flags & OPf_STACKED)
2351 { 2559 {
2352 if (items > slf_arga) 2560 if (items > slf_arga)
2353 { 2561 {
2354 slf_arga = items; 2562 slf_arga = items;
2355 free (slf_argv); 2563 Safefree (slf_argv);
2356 slf_argv = malloc (slf_arga * sizeof (SV *)); 2564 New (0, slf_argv, slf_arga, SV *);
2357 } 2565 }
2358 2566
2359 slf_argc = items; 2567 slf_argc = items;
2360 2568
2361 for (i = 0; i < items; ++i) 2569 for (i = 0; i < items; ++i)
… …
2722 { 2930 {
2723 SV *cb_cv = s_get_cv_croak (arg [1]); 2931 SV *cb_cv = s_get_cv_croak (arg [1]);
2724 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2932 av_push (av, SvREFCNT_inc_NN (cb_cv));
2725 2933
2726 if (SvIVX (AvARRAY (av)[0])) 2934 if (SvIVX (AvARRAY (av)[0]))
2727 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2935 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2728 2936
2729 frame->prepare = prepare_nop; 2937 frame->prepare = prepare_nop;
2730 frame->check = slf_check_nop; 2938 frame->check = slf_check_nop;
2731 } 2939 }
2732 else if (SvIVX (AvARRAY (av)[0])) 2940 else if (SvIVX (AvARRAY (av)[0]))
… …
2894 /* now call the AIO function - we assume our request is uncancelable */ 3102 /* now call the AIO function - we assume our request is uncancelable */
2895 PUTBACK; 3103 PUTBACK;
2896 call_sv ((SV *)req, G_VOID | G_DISCARD); 3104 call_sv ((SV *)req, G_VOID | G_DISCARD);
2897 } 3105 }
2898 3106
2899 /* now that the requets is going, we loop toll we have a result */ 3107 /* now that the request is going, we loop till we have a result */
2900 frame->data = (void *)state; 3108 frame->data = (void *)state;
2901 frame->prepare = prepare_schedule; 3109 frame->prepare = prepare_schedule;
2902 frame->check = slf_check_aio_req; 3110 frame->check = slf_check_aio_req;
2903} 3111}
2904 3112
… …
3035 coroapi.prepare_nop = prepare_nop; 3243 coroapi.prepare_nop = prepare_nop;
3036 coroapi.prepare_schedule = prepare_schedule; 3244 coroapi.prepare_schedule = prepare_schedule;
3037 coroapi.prepare_cede = prepare_cede; 3245 coroapi.prepare_cede = prepare_cede;
3038 coroapi.prepare_cede_notself = prepare_cede_notself; 3246 coroapi.prepare_cede_notself = prepare_cede_notself;
3039 3247
3040 { 3248 time_init (aTHX);
3041 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3042
3043 if (!svp) croak ("Time::HiRes is required");
3044 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3045
3046 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3047
3048 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3049 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3050 }
3051 3249
3052 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3250 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3053} 3251}
3054 3252
3055SV * 3253SV *
… …
3064void 3262void
3065transfer (...) 3263transfer (...)
3066 PROTOTYPE: $$ 3264 PROTOTYPE: $$
3067 CODE: 3265 CODE:
3068 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3266 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3069
3070bool
3071_destroy (SV *coro_sv)
3072 CODE:
3073 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3074 OUTPUT:
3075 RETVAL
3076 3267
3077void 3268void
3078_exit (int code) 3269_exit (int code)
3079 PROTOTYPE: $ 3270 PROTOTYPE: $
3080 CODE: 3271 CODE:
… …
3156 CODE: 3347 CODE:
3157{ 3348{
3158 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3349 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3159 { 3350 {
3160 struct coro *current = SvSTATE_current; 3351 struct coro *current = SvSTATE_current;
3352 struct CoroSLF slf_save;
3161 3353
3162 if (current != coro) 3354 if (current != coro)
3163 { 3355 {
3164 PUTBACK; 3356 PUTBACK;
3165 save_perl (aTHX_ current); 3357 save_perl (aTHX_ current);
3166 load_perl (aTHX_ coro); 3358 load_perl (aTHX_ coro);
3359 /* the coro is most likely in an active SLF call.
3360 * while not strictly required (the code we execute is
3361 * not allowed to call any SLF functions), it's cleaner
3362 * to reinitialise the slf_frame and restore it later.
3363 * This might one day allow us to actually do SLF calls
3364 * from code executed here.
3365 */
3366 slf_save = slf_frame;
3367 slf_frame.prepare = 0;
3167 SPAGAIN; 3368 SPAGAIN;
3168 } 3369 }
3169 3370
3170 PUSHSTACK; 3371 PUSHSTACK;
3171 3372
… …
3181 SPAGAIN; 3382 SPAGAIN;
3182 3383
3183 if (current != coro) 3384 if (current != coro)
3184 { 3385 {
3185 PUTBACK; 3386 PUTBACK;
3387 slf_frame = slf_save;
3186 save_perl (aTHX_ coro); 3388 save_perl (aTHX_ coro);
3187 load_perl (aTHX_ current); 3389 load_perl (aTHX_ current);
3188 SPAGAIN; 3390 SPAGAIN;
3189 } 3391 }
3190 } 3392 }
… …
3203 RETVAL = boolSV (coro->flags & ix); 3405 RETVAL = boolSV (coro->flags & ix);
3204 OUTPUT: 3406 OUTPUT:
3205 RETVAL 3407 RETVAL
3206 3408
3207void 3409void
3208throw (Coro::State self, SV *throw = &PL_sv_undef) 3410throw (Coro::State self, SV *exception = &PL_sv_undef)
3209 PROTOTYPE: $;$ 3411 PROTOTYPE: $;$
3210 CODE: 3412 CODE:
3211{ 3413{
3212 struct coro *current = SvSTATE_current; 3414 struct coro *current = SvSTATE_current;
3213 SV **throwp = self == current ? &CORO_THROW : &self->except; 3415 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3214 SvREFCNT_dec (*throwp); 3416 SvREFCNT_dec (*exceptionp);
3215 SvGETMAGIC (throw); 3417 SvGETMAGIC (exception);
3216 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3418 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3217} 3419}
3218 3420
3219void 3421void
3220api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3422api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3221 PROTOTYPE: $;$ 3423 PROTOTYPE: $;$
… …
3276 3478
3277void 3479void
3278cancel (Coro::State self) 3480cancel (Coro::State self)
3279 CODE: 3481 CODE:
3280 coro_state_destroy (aTHX_ self); 3482 coro_state_destroy (aTHX_ self);
3281 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3282
3283 3483
3284SV * 3484SV *
3285enable_times (int enabled = enable_times) 3485enable_times (int enabled = enable_times)
3286 CODE: 3486 CODE:
3287{ 3487{
… …
3315 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3515 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3316 3516
3317 if (expect_false (current == self)) 3517 if (expect_false (current == self))
3318 coro_times_sub (SvSTATE (coro_current)); 3518 coro_times_sub (SvSTATE (coro_current));
3319} 3519}
3520
3521void
3522swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3523 CODE:
3524{
3525 struct coro *current = SvSTATE_current;
3526
3527 if (current == coro)
3528 SWAP_SVS (current);
3529
3530 if (!coro->swap_sv)
3531 coro->swap_sv = newAV ();
3532
3533 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3534 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3535
3536 if (current == coro)
3537 SWAP_SVS (current);
3538}
3539
3320 3540
3321MODULE = Coro::State PACKAGE = Coro 3541MODULE = Coro::State PACKAGE = Coro
3322 3542
3323BOOT: 3543BOOT:
3324{ 3544{
… …
3372 api_ready (aTHX_ RETVAL); 3592 api_ready (aTHX_ RETVAL);
3373 OUTPUT: 3593 OUTPUT:
3374 RETVAL 3594 RETVAL
3375 3595
3376void 3596void
3597_destroy (Coro::State coro)
3598 CODE:
3599 /* used by the manager thread */
3600 coro_state_destroy (aTHX_ coro);
3601 coro_call_on_destroy (aTHX_ coro);
3602
3603void
3377terminate (...) 3604terminate (...)
3378 CODE: 3605 CODE:
3379 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3606 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3607
3608void
3609cancel (...)
3610 CODE:
3611 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3380 3612
3381void 3613void
3382schedule (...) 3614schedule (...)
3383 CODE: 3615 CODE:
3384 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3616 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3781 { 4013 {
3782 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4014 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3783 coro_old_pp_sselect = 0; 4015 coro_old_pp_sselect = 0;
3784 } 4016 }
3785 4017
3786

Diff Legend

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