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.373 by root, Thu Oct 1 23:51:33 2009 UTC vs.
Revision 1.393 by root, Fri Apr 29 17:38:56 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;
… …
1041 save_perl (aTHX_ current); 1163 save_perl (aTHX_ current);
1042 load_perl (aTHX_ coro); 1164 load_perl (aTHX_ coro);
1043 1165
1044 coro_unwind_stacks (aTHX); 1166 coro_unwind_stacks (aTHX);
1045 coro_destruct_stacks (aTHX); 1167 coro_destruct_stacks (aTHX);
1168
1169 /* restore swapped sv's */
1170 SWAP_SVS (coro);
1046 1171
1047 // now save some sv's to be free'd later 1172 // now save some sv's to be free'd later
1048 svf [0] = GvSV (PL_defgv); 1173 svf [0] = GvSV (PL_defgv);
1049 svf [1] = (SV *)GvAV (PL_defgv); 1174 svf [1] = (SV *)GvAV (PL_defgv);
1050 svf [2] = GvSV (PL_errgv); 1175 svf [2] = GvSV (PL_errgv);
… …
1372cctx_destroy (coro_cctx *cctx) 1497cctx_destroy (coro_cctx *cctx)
1373{ 1498{
1374 if (!cctx) 1499 if (!cctx)
1375 return; 1500 return;
1376 1501
1377 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1502 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1378 1503
1379 --cctx_count; 1504 --cctx_count;
1380 coro_destroy (&cctx->cctx); 1505 coro_destroy (&cctx->cctx);
1381 1506
1382 /* coro_transfer creates new, empty cctx's */ 1507 /* coro_transfer creates new, empty cctx's */
… …
1492 if (expect_false (next->flags & CF_NEW)) 1617 if (expect_false (next->flags & CF_NEW))
1493 { 1618 {
1494 /* need to start coroutine */ 1619 /* need to start coroutine */
1495 next->flags &= ~CF_NEW; 1620 next->flags &= ~CF_NEW;
1496 /* setup coroutine call */ 1621 /* setup coroutine call */
1497 coro_setup (aTHX_ next); 1622 init_perl (aTHX_ next);
1498 } 1623 }
1499 else 1624 else
1500 load_perl (aTHX_ next); 1625 load_perl (aTHX_ next);
1501 1626
1502 /* possibly untie and reuse the cctx */ 1627 /* possibly untie and reuse the cctx */
… …
1550 return 0; 1675 return 0;
1551 1676
1552 if (coro->on_destroy && !PL_dirty) 1677 if (coro->on_destroy && !PL_dirty)
1553 coro->on_destroy (aTHX_ coro); 1678 coro->on_destroy (aTHX_ coro);
1554 1679
1680 /*
1681 * The on_destroy above most likely is from an SLF call.
1682 * Since by definition the SLF call will not finish when we destroy
1683 * the coro, we will have to force-finish it here, otherwise
1684 * cleanup functions cannot call SLF functions.
1685 */
1686 coro->slf_frame.prepare = 0;
1687
1555 coro->flags |= CF_DESTROYED; 1688 coro->flags |= CF_DESTROYED;
1556 1689
1557 if (coro->flags & CF_READY) 1690 if (coro->flags & CF_READY)
1558 { 1691 {
1559 /* reduce nready, as destroying a ready coro effectively unreadies it */ 1692 /* reduce nready, as destroying a ready coro effectively unreadies it */
… …
1565 1698
1566 if (coro->mainstack 1699 if (coro->mainstack
1567 && coro->mainstack != main_mainstack 1700 && coro->mainstack != main_mainstack
1568 && coro->slot 1701 && coro->slot
1569 && !PL_dirty) 1702 && !PL_dirty)
1570 coro_destruct_perl (aTHX_ coro); 1703 destroy_perl (aTHX_ coro);
1704
1705 if (coro->next) coro->next->prev = coro->prev;
1706 if (coro->prev) coro->prev->next = coro->next;
1707 if (coro == coro_first) coro_first = coro->next;
1571 1708
1572 cctx_destroy (coro->cctx); 1709 cctx_destroy (coro->cctx);
1573 SvREFCNT_dec (coro->startcv); 1710 SvREFCNT_dec (coro->startcv);
1574 SvREFCNT_dec (coro->args); 1711 SvREFCNT_dec (coro->args);
1712 SvREFCNT_dec (coro->swap_sv);
1575 SvREFCNT_dec (CORO_THROW); 1713 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 1714
1581 return 1; 1715 return 1;
1582} 1716}
1583 1717
1584static int 1718static int
… …
1754 { 1888 {
1755 /* nothing to schedule: call the idle handler */ 1889 /* nothing to schedule: call the idle handler */
1756 if (SvROK (sv_idle) 1890 if (SvROK (sv_idle)
1757 && SvOBJECT (SvRV (sv_idle))) 1891 && SvOBJECT (SvRV (sv_idle)))
1758 { 1892 {
1893 if (SvRV (sv_idle) == SvRV (coro_current))
1894 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1895
1759 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1896 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1760 api_ready (aTHX_ SvRV (sv_idle)); 1897 api_ready (aTHX_ SvRV (sv_idle));
1761 --coro_nready; 1898 --coro_nready;
1762 } 1899 }
1763 else 1900 else
… …
1880 2017
1881static void 2018static void
1882coro_call_on_destroy (pTHX_ struct coro *coro) 2019coro_call_on_destroy (pTHX_ struct coro *coro)
1883{ 2020{
1884 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2021 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 2022
1887 if (on_destroyp) 2023 if (on_destroyp)
1888 { 2024 {
1889 AV *on_destroy = (AV *)SvRV (*on_destroyp); 2025 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2026 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2027 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
1890 2028
1891 while (AvFILLp (on_destroy) >= 0) 2029 while (AvFILLp (on_destroy) >= 0)
1892 { 2030 {
1893 dSP; /* don't disturb outer sp */ 2031 dSP; /* don't disturb outer sp */
1894 SV *cb = av_pop (on_destroy); 2032 SV *cb = av_pop (on_destroy);
… …
1896 PUSHMARK (SP); 2034 PUSHMARK (SP);
1897 2035
1898 if (statusp) 2036 if (statusp)
1899 { 2037 {
1900 int i; 2038 int i;
1901 AV *status = (AV *)SvRV (*statusp);
1902 EXTEND (SP, AvFILLp (status) + 1); 2039 EXTEND (SP, AvFILLp (status) + 1);
1903 2040
1904 for (i = 0; i <= AvFILLp (status); ++i) 2041 for (i = 0; i <= AvFILLp (status); ++i)
1905 PUSHs (AvARRAY (status)[i]); 2042 PUSHs (AvARRAY (status)[i]);
1906 } 2043 }
… …
1910 } 2047 }
1911 } 2048 }
1912} 2049}
1913 2050
1914static void 2051static void
1915slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2052coro_set_status (HV *coro_hv, SV **arg, int items)
1916{ 2053{
1917 int i;
1918 HV *hv = (HV *)SvRV (coro_current);
1919 AV *av = newAV (); 2054 AV *av = newAV ();
1920 2055
1921 /* items are actually not so common, so optimise for this case */ 2056 /* items are actually not so common, so optimise for this case */
1922 if (items) 2057 if (items)
1923 { 2058 {
2059 int i;
2060
1924 av_extend (av, items - 1); 2061 av_extend (av, items - 1);
1925 2062
1926 for (i = 0; i < items; ++i) 2063 for (i = 0; i < items; ++i)
1927 av_push (av, SvREFCNT_inc_NN (arg [i])); 2064 av_push (av, SvREFCNT_inc_NN (arg [i]));
1928 } 2065 }
1929 2066
1930 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2067 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2068}
1931 2069
2070static void
2071slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2072{
1932 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2073 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1933 api_ready (aTHX_ sv_manager); 2074 api_ready (aTHX_ sv_manager);
1934 2075
1935 frame->prepare = prepare_schedule; 2076 frame->prepare = prepare_schedule;
1936 frame->check = slf_check_repeat; 2077 frame->check = slf_check_repeat;
1937 2078
1938 /* as a minor optimisation, we could unwind all stacks here */ 2079 /* as a minor optimisation, we could unwind all stacks here */
1939 /* but that puts extra pressure on pp_slf, and is not worth much */ 2080 /* but that puts extra pressure on pp_slf, and is not worth much */
1940 /*coro_unwind_stacks (aTHX);*/ 2081 /*coro_unwind_stacks (aTHX);*/
2082}
2083
2084static void
2085slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2086{
2087 HV *coro_hv = (HV *)SvRV (coro_current);
2088
2089 coro_set_status (coro_hv, arg, items);
2090 slf_init_terminate_cancel_common (frame, coro_hv);
2091}
2092
2093static void
2094slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2095{
2096 HV *coro_hv;
2097 struct coro *coro;
2098
2099 if (items <= 0)
2100 croak ("Coro::cancel called without coro object,");
2101
2102 coro = SvSTATE (arg [0]);
2103 coro_hv = coro->hv;
2104
2105 coro_set_status (coro_hv, arg + 1, items - 1);
2106
2107 if (expect_false (coro->flags & CF_NOCANCEL))
2108 {
2109 /* coro currently busy cancelling something, so just notify it */
2110 coro->slf_frame.data = (void *)coro;
2111
2112 frame->prepare = prepare_nop;
2113 frame->check = slf_check_nop;
2114 }
2115 else if (coro_hv == (HV *)SvRV (coro_current))
2116 {
2117 /* cancelling the current coro is allowed, and equals terminate */
2118 slf_init_terminate_cancel_common (frame, coro_hv);
2119 }
2120 else
2121 {
2122 struct coro *self = SvSTATE_current;
2123
2124 /* otherwise we cancel directly, purely for speed reasons
2125 * unfortunately, this requires some magic trickery, as
2126 * somebody else could cancel us, so we have to fight the cancellation.
2127 * this is ugly, and hopefully fully worth the extra speed.
2128 * besides, I can't get the slow-but-safe version working...
2129 */
2130 slf_frame.data = 0;
2131 self->flags |= CF_NOCANCEL;
2132
2133 coro_state_destroy (aTHX_ coro);
2134 coro_call_on_destroy (aTHX_ coro);
2135
2136 self->flags &= ~CF_NOCANCEL;
2137
2138 if (slf_frame.data)
2139 {
2140 /* while we were busy we have been cancelled, so terminate */
2141 slf_init_terminate_cancel_common (frame, self->hv);
2142 }
2143 else
2144 {
2145 frame->prepare = prepare_nop;
2146 frame->check = slf_check_nop;
2147 }
2148 }
1941} 2149}
1942 2150
1943/*****************************************************************************/ 2151/*****************************************************************************/
1944/* async pool handler */ 2152/* async pool handler */
1945 2153
… …
2349 if (PL_op->op_flags & OPf_STACKED) 2557 if (PL_op->op_flags & OPf_STACKED)
2350 { 2558 {
2351 if (items > slf_arga) 2559 if (items > slf_arga)
2352 { 2560 {
2353 slf_arga = items; 2561 slf_arga = items;
2354 free (slf_argv); 2562 Safefree (slf_argv);
2355 slf_argv = malloc (slf_arga * sizeof (SV *)); 2563 New (0, slf_argv, slf_arga, SV *);
2356 } 2564 }
2357 2565
2358 slf_argc = items; 2566 slf_argc = items;
2359 2567
2360 for (i = 0; i < items; ++i) 2568 for (i = 0; i < items; ++i)
… …
2721 { 2929 {
2722 SV *cb_cv = s_get_cv_croak (arg [1]); 2930 SV *cb_cv = s_get_cv_croak (arg [1]);
2723 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2931 av_push (av, SvREFCNT_inc_NN (cb_cv));
2724 2932
2725 if (SvIVX (AvARRAY (av)[0])) 2933 if (SvIVX (AvARRAY (av)[0]))
2726 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2934 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2727 2935
2728 frame->prepare = prepare_nop; 2936 frame->prepare = prepare_nop;
2729 frame->check = slf_check_nop; 2937 frame->check = slf_check_nop;
2730 } 2938 }
2731 else if (SvIVX (AvARRAY (av)[0])) 2939 else if (SvIVX (AvARRAY (av)[0]))
… …
2893 /* now call the AIO function - we assume our request is uncancelable */ 3101 /* now call the AIO function - we assume our request is uncancelable */
2894 PUTBACK; 3102 PUTBACK;
2895 call_sv ((SV *)req, G_VOID | G_DISCARD); 3103 call_sv ((SV *)req, G_VOID | G_DISCARD);
2896 } 3104 }
2897 3105
2898 /* now that the requets is going, we loop toll we have a result */ 3106 /* now that the request is going, we loop till we have a result */
2899 frame->data = (void *)state; 3107 frame->data = (void *)state;
2900 frame->prepare = prepare_schedule; 3108 frame->prepare = prepare_schedule;
2901 frame->check = slf_check_aio_req; 3109 frame->check = slf_check_aio_req;
2902} 3110}
2903 3111
… …
3034 coroapi.prepare_nop = prepare_nop; 3242 coroapi.prepare_nop = prepare_nop;
3035 coroapi.prepare_schedule = prepare_schedule; 3243 coroapi.prepare_schedule = prepare_schedule;
3036 coroapi.prepare_cede = prepare_cede; 3244 coroapi.prepare_cede = prepare_cede;
3037 coroapi.prepare_cede_notself = prepare_cede_notself; 3245 coroapi.prepare_cede_notself = prepare_cede_notself;
3038 3246
3039 { 3247 time_init (aTHX);
3040 SV **svp = hv_fetch (PL_modglobal, "Time::NVtime", 12, 0);
3041
3042 if (!svp) croak ("Time::HiRes is required");
3043 if (!SvIOK (*svp)) croak ("Time::NVtime isn't a function pointer");
3044
3045 nvtime = INT2PTR (double (*)(), SvIV (*svp));
3046
3047 svp = hv_fetch (PL_modglobal, "Time::U2time", 12, 0);
3048 u2time = INT2PTR (void (*)(pTHX_ UV ret[2]), SvIV (*svp));
3049 }
3050 3248
3051 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3249 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3052} 3250}
3053 3251
3054SV * 3252SV *
… …
3063void 3261void
3064transfer (...) 3262transfer (...)
3065 PROTOTYPE: $$ 3263 PROTOTYPE: $$
3066 CODE: 3264 CODE:
3067 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3265 CORO_EXECUTE_SLF_XS (slf_init_transfer);
3068
3069bool
3070_destroy (SV *coro_sv)
3071 CODE:
3072 RETVAL = coro_state_destroy (aTHX_ SvSTATE (coro_sv));
3073 OUTPUT:
3074 RETVAL
3075 3266
3076void 3267void
3077_exit (int code) 3268_exit (int code)
3078 PROTOTYPE: $ 3269 PROTOTYPE: $
3079 CODE: 3270 CODE:
… …
3155 CODE: 3346 CODE:
3156{ 3347{
3157 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3348 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3158 { 3349 {
3159 struct coro *current = SvSTATE_current; 3350 struct coro *current = SvSTATE_current;
3351 struct CoroSLF slf_save;
3160 3352
3161 if (current != coro) 3353 if (current != coro)
3162 { 3354 {
3163 PUTBACK; 3355 PUTBACK;
3164 save_perl (aTHX_ current); 3356 save_perl (aTHX_ current);
3165 load_perl (aTHX_ coro); 3357 load_perl (aTHX_ coro);
3358 /* the coro is most likely in an active SLF call.
3359 * while not strictly required (the code we execute is
3360 * not allowed to call any SLF functions), it's cleaner
3361 * to reinitialise the slf_frame and restore it later.
3362 * This might one day allow us to actually do SLF calls
3363 * from code executed here.
3364 */
3365 slf_save = slf_frame;
3366 slf_frame.prepare = 0;
3166 SPAGAIN; 3367 SPAGAIN;
3167 } 3368 }
3168 3369
3169 PUSHSTACK; 3370 PUSHSTACK;
3170 3371
… …
3180 SPAGAIN; 3381 SPAGAIN;
3181 3382
3182 if (current != coro) 3383 if (current != coro)
3183 { 3384 {
3184 PUTBACK; 3385 PUTBACK;
3386 slf_frame = slf_save;
3185 save_perl (aTHX_ coro); 3387 save_perl (aTHX_ coro);
3186 load_perl (aTHX_ current); 3388 load_perl (aTHX_ current);
3187 SPAGAIN; 3389 SPAGAIN;
3188 } 3390 }
3189 } 3391 }
… …
3202 RETVAL = boolSV (coro->flags & ix); 3404 RETVAL = boolSV (coro->flags & ix);
3203 OUTPUT: 3405 OUTPUT:
3204 RETVAL 3406 RETVAL
3205 3407
3206void 3408void
3207throw (Coro::State self, SV *throw = &PL_sv_undef) 3409throw (Coro::State self, SV *exception = &PL_sv_undef)
3208 PROTOTYPE: $;$ 3410 PROTOTYPE: $;$
3209 CODE: 3411 CODE:
3210{ 3412{
3211 struct coro *current = SvSTATE_current; 3413 struct coro *current = SvSTATE_current;
3212 SV **throwp = self == current ? &CORO_THROW : &self->except; 3414 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3213 SvREFCNT_dec (*throwp); 3415 SvREFCNT_dec (*exceptionp);
3214 SvGETMAGIC (throw); 3416 SvGETMAGIC (exception);
3215 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3417 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3216} 3418}
3217 3419
3218void 3420void
3219api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3421api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3220 PROTOTYPE: $;$ 3422 PROTOTYPE: $;$
… …
3275 3477
3276void 3478void
3277cancel (Coro::State self) 3479cancel (Coro::State self)
3278 CODE: 3480 CODE:
3279 coro_state_destroy (aTHX_ self); 3481 coro_state_destroy (aTHX_ self);
3280 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3281
3282 3482
3283SV * 3483SV *
3284enable_times (int enabled = enable_times) 3484enable_times (int enabled = enable_times)
3285 CODE: 3485 CODE:
3286{ 3486{
… …
3314 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3514 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3315 3515
3316 if (expect_false (current == self)) 3516 if (expect_false (current == self))
3317 coro_times_sub (SvSTATE (coro_current)); 3517 coro_times_sub (SvSTATE (coro_current));
3318} 3518}
3519
3520void
3521swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3522 CODE:
3523{
3524 struct coro *current = SvSTATE_current;
3525
3526 if (current == coro)
3527 SWAP_SVS (current);
3528
3529 if (!coro->swap_sv)
3530 coro->swap_sv = newAV ();
3531
3532 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3533 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3534
3535 if (current == coro)
3536 SWAP_SVS (current);
3537}
3538
3319 3539
3320MODULE = Coro::State PACKAGE = Coro 3540MODULE = Coro::State PACKAGE = Coro
3321 3541
3322BOOT: 3542BOOT:
3323{ 3543{
… …
3371 api_ready (aTHX_ RETVAL); 3591 api_ready (aTHX_ RETVAL);
3372 OUTPUT: 3592 OUTPUT:
3373 RETVAL 3593 RETVAL
3374 3594
3375void 3595void
3596_destroy (Coro::State coro)
3597 CODE:
3598 /* used by the manager thread */
3599 coro_state_destroy (aTHX_ coro);
3600 coro_call_on_destroy (aTHX_ coro);
3601
3602void
3376terminate (...) 3603terminate (...)
3377 CODE: 3604 CODE:
3378 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3605 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3606
3607void
3608cancel (...)
3609 CODE:
3610 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3379 3611
3380void 3612void
3381schedule (...) 3613schedule (...)
3382 CODE: 3614 CODE:
3383 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3615 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3780 { 4012 {
3781 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4013 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3782 coro_old_pp_sselect = 0; 4014 coro_old_pp_sselect = 0;
3783 } 4015 }
3784 4016
3785

Diff Legend

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