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.368 by root, Thu Aug 13 02:35:41 2009 UTC vs.
Revision 1.394 by root, Sat Apr 30 05:17:43 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
… …
142static SV *sv_pool_size; 152static SV *sv_pool_size;
143static SV *sv_async_pool_idle; /* description string */ 153static SV *sv_async_pool_idle; /* description string */
144static AV *av_async_pool; /* idle pool */ 154static AV *av_async_pool; /* idle pool */
145static SV *sv_Coro; /* class string */ 155static SV *sv_Coro; /* class string */
146static CV *cv_pool_handler; 156static CV *cv_pool_handler;
147static CV *cv_coro_state_new;
148 157
149/* Coro::AnyEvent */ 158/* Coro::AnyEvent */
150static SV *sv_activity; 159static SV *sv_activity;
151 160
152/* enable processtime/realtime profiling */ 161/* enable processtime/realtime profiling */
… …
187 int valgrind_id; 196 int valgrind_id;
188#endif 197#endif
189 unsigned char flags; 198 unsigned char flags;
190} coro_cctx; 199} coro_cctx;
191 200
192coro_cctx *cctx_current; /* the currently running cctx */ 201static coro_cctx *cctx_current; /* the currently running cctx */
193 202
194/*****************************************************************************/ 203/*****************************************************************************/
195 204
196enum { 205enum {
197 CF_RUNNING = 0x0001, /* coroutine is running */ 206 CF_RUNNING = 0x0001, /* coroutine is running */
198 CF_READY = 0x0002, /* coroutine is ready */ 207 CF_READY = 0x0002, /* coroutine is ready */
199 CF_NEW = 0x0004, /* has never been switched to */ 208 CF_NEW = 0x0004, /* has never been switched to */
200 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 209 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
201 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) */
202}; 212};
203 213
204/* 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 */
205typedef struct 215typedef struct
206{ 216{
… …
232 CV *startcv; /* the CV to execute */ 242 CV *startcv; /* the CV to execute */
233 AV *args; /* data associated with this coroutine (initial args) */ 243 AV *args; /* data associated with this coroutine (initial args) */
234 int refcnt; /* coroutines are refcounted, yes */ 244 int refcnt; /* coroutines are refcounted, yes */
235 int flags; /* CF_ flags */ 245 int flags; /* CF_ flags */
236 HV *hv; /* the perl hash associated with this coro, if any */ 246 HV *hv; /* the perl hash associated with this coro, if any */
237 void (*on_destroy)(pTHX_ struct coro *coro); 247 void (*on_destroy)(pTHX_ struct coro *coro); /* for temporary use by xs in critical sections */
238 248
239 /* statistics */ 249 /* statistics */
240 int usecount; /* number of transfers to this coro */ 250 int usecount; /* number of transfers to this coro */
241 251
242 /* coro process data */ 252 /* coro process data */
… …
251 261
252 /* on_enter/on_leave */ 262 /* on_enter/on_leave */
253 AV *on_enter; 263 AV *on_enter;
254 AV *on_leave; 264 AV *on_leave;
255 265
266 /* swap_sv */
267 AV *swap_sv;
268
256 /* times */ 269 /* times */
257 coro_ts t_cpu, t_real; 270 coro_ts t_cpu, t_real;
258 271
259 /* linked list */ 272 /* linked list */
260 struct coro *next, *prev; 273 struct coro *next, *prev;
… …
263typedef struct coro *Coro__State; 276typedef struct coro *Coro__State;
264typedef struct coro *Coro__State_or_hashref; 277typedef struct coro *Coro__State_or_hashref;
265 278
266/* the following variables are effectively part of the perl context */ 279/* the following variables are effectively part of the perl context */
267/* and get copied between struct coro and these variables */ 280/* and get copied between struct coro and these variables */
268/* the mainr easonw e don't support windows process emulation */ 281/* the main reason we don't support windows process emulation */
269static struct CoroSLF slf_frame; /* the current slf frame */ 282static struct CoroSLF slf_frame; /* the current slf frame */
270 283
271/** Coro ********************************************************************/ 284/** Coro ********************************************************************/
272 285
273#define CORO_PRIO_MAX 3 286#define CORO_PRIO_MAX 3
… …
290static OP *(*coro_old_pp_sselect) (pTHX); 303static OP *(*coro_old_pp_sselect) (pTHX);
291static SV *coro_select_select; 304static SV *coro_select_select;
292 305
293/* horrible hack, but if it works... */ 306/* horrible hack, but if it works... */
294static OP * 307static OP *
295coro_pp_sselect (aTHX) 308coro_pp_sselect (pTHX)
296{ 309{
297 dSP; 310 dSP;
298 PUSHMARK (SP - 4); /* fake argument list */ 311 PUSHMARK (SP - 4); /* fake argument list */
299 XPUSHs (coro_select_select); 312 XPUSHs (coro_select_select);
300 PUTBACK; 313 PUTBACK;
… …
302 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */ 315 /* entersub is an UNOP, select a LISTOP... keep your fingers crossed */
303 PL_op->op_flags |= OPf_STACKED; 316 PL_op->op_flags |= OPf_STACKED;
304 PL_op->op_private = 0; 317 PL_op->op_private = 0;
305 return PL_ppaddr [OP_ENTERSUB](aTHX); 318 return PL_ppaddr [OP_ENTERSUB](aTHX);
306} 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
307 372
308/** lowlevel stuff **********************************************************/ 373/** lowlevel stuff **********************************************************/
309 374
310static SV * 375static SV *
311coro_get_sv (pTHX_ const char *name, int create) 376coro_get_sv (pTHX_ const char *name, int create)
… …
551 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 616 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
552} 617}
553 618
554/** load & save, init *******************************************************/ 619/** load & save, init *******************************************************/
555 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
556static void 672static void
557on_enterleave_call (pTHX_ SV *cb); 673on_enterleave_call (pTHX_ SV *cb);
558 674
559static void 675static void
560load_perl (pTHX_ Coro__State c) 676load_perl (pTHX_ Coro__State c)
… …
606 int i; 722 int i;
607 723
608 for (i = 0; i <= AvFILLp (c->on_enter); ++i) 724 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
609 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]); 725 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
610 } 726 }
727
728 SWAP_SVS (c);
611} 729}
612 730
613static void 731static void
614save_perl (pTHX_ Coro__State c) 732save_perl (pTHX_ Coro__State c)
615{ 733{
734 SWAP_SVS (c);
735
616 if (expect_false (c->on_leave)) 736 if (expect_false (c->on_leave))
617 { 737 {
618 int i; 738 int i;
619 739
620 for (i = AvFILLp (c->on_leave); i >= 0; --i) 740 for (i = AvFILLp (c->on_leave); i >= 0; --i)
… …
927slf_check_repeat (pTHX_ struct CoroSLF *frame) 1047slf_check_repeat (pTHX_ struct CoroSLF *frame)
928{ 1048{
929 return 1; 1049 return 1;
930} 1050}
931 1051
932static UNOP coro_setup_op; 1052static UNOP init_perl_op;
933 1053
934static 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 */
935coro_setup (pTHX_ struct coro *coro) 1055init_perl (pTHX_ struct coro *coro)
936{ 1056{
937 /* 1057 /*
938 * emulate part of the perl startup here. 1058 * emulate part of the perl startup here.
939 */ 1059 */
940 coro_init_stacks (aTHX); 1060 coro_init_stacks (aTHX);
… …
947 PL_comppad_name_fill = 0; 1067 PL_comppad_name_fill = 0;
948 PL_comppad_name_floor = 0; 1068 PL_comppad_name_floor = 0;
949 PL_curpm = 0; 1069 PL_curpm = 0;
950 PL_curpad = 0; 1070 PL_curpad = 0;
951 PL_localizing = 0; 1071 PL_localizing = 0;
952 PL_dirty = 0;
953 PL_restartop = 0; 1072 PL_restartop = 0;
954#if PERL_VERSION_ATLEAST (5,10,0) 1073#if PERL_VERSION_ATLEAST (5,10,0)
955 PL_parser = 0; 1074 PL_parser = 0;
956#endif 1075#endif
957 PL_hints = 0; 1076 PL_hints = 0;
… …
989 */ 1108 */
990 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 */
991 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 */
992 1111
993 /* 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 */
994 coro_setup_op.op_next = PL_op; 1113 init_perl_op.op_next = PL_op;
995 coro_setup_op.op_type = OP_ENTERSUB; 1114 init_perl_op.op_type = OP_ENTERSUB;
996 coro_setup_op.op_ppaddr = pp_slf; 1115 init_perl_op.op_ppaddr = pp_slf;
997 /* 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 */
998 1117
999 PL_op = (OP *)&coro_setup_op; 1118 PL_op = (OP *)&init_perl_op;
1000 1119
1001 /* copy throw, in case it was set before coro_setup */ 1120 /* copy throw, in case it was set before init_perl */
1002 CORO_THROW = coro->except; 1121 CORO_THROW = coro->except;
1122
1123 SWAP_SVS (coro);
1003 1124
1004 if (expect_false (enable_times)) 1125 if (expect_false (enable_times))
1005 { 1126 {
1006 coro_times_update (); 1127 coro_times_update ();
1007 coro_times_sub (coro); 1128 coro_times_sub (coro);
… …
1028 dounwind (-1); 1149 dounwind (-1);
1029 } 1150 }
1030} 1151}
1031 1152
1032static void 1153static void
1033coro_destruct_perl (pTHX_ struct coro *coro) 1154destroy_perl (pTHX_ struct coro *coro)
1034{ 1155{
1035 SV *svf [9]; 1156 SV *svf [9];
1036 1157
1037 { 1158 {
1038 struct coro *current = SvSTATE_current; 1159 struct coro *current = SvSTATE_current;
… …
1042 save_perl (aTHX_ current); 1163 save_perl (aTHX_ current);
1043 load_perl (aTHX_ coro); 1164 load_perl (aTHX_ coro);
1044 1165
1045 coro_unwind_stacks (aTHX); 1166 coro_unwind_stacks (aTHX);
1046 coro_destruct_stacks (aTHX); 1167 coro_destruct_stacks (aTHX);
1168
1169 /* restore swapped sv's */
1170 SWAP_SVS (coro);
1047 1171
1048 // now save some sv's to be free'd later 1172 // now save some sv's to be free'd later
1049 svf [0] = GvSV (PL_defgv); 1173 svf [0] = GvSV (PL_defgv);
1050 svf [1] = (SV *)GvAV (PL_defgv); 1174 svf [1] = (SV *)GvAV (PL_defgv);
1051 svf [2] = GvSV (PL_errgv); 1175 svf [2] = GvSV (PL_errgv);
… …
1373cctx_destroy (coro_cctx *cctx) 1497cctx_destroy (coro_cctx *cctx)
1374{ 1498{
1375 if (!cctx) 1499 if (!cctx)
1376 return; 1500 return;
1377 1501
1378 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary? 1502 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));
1379 1503
1380 --cctx_count; 1504 --cctx_count;
1381 coro_destroy (&cctx->cctx); 1505 coro_destroy (&cctx->cctx);
1382 1506
1383 /* coro_transfer creates new, empty cctx's */ 1507 /* coro_transfer creates new, empty cctx's */
… …
1493 if (expect_false (next->flags & CF_NEW)) 1617 if (expect_false (next->flags & CF_NEW))
1494 { 1618 {
1495 /* need to start coroutine */ 1619 /* need to start coroutine */
1496 next->flags &= ~CF_NEW; 1620 next->flags &= ~CF_NEW;
1497 /* setup coroutine call */ 1621 /* setup coroutine call */
1498 coro_setup (aTHX_ next); 1622 init_perl (aTHX_ next);
1499 } 1623 }
1500 else 1624 else
1501 load_perl (aTHX_ next); 1625 load_perl (aTHX_ next);
1502 1626
1503 /* possibly untie and reuse the cctx */ 1627 /* possibly untie and reuse the cctx */
… …
1542#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx)) 1666#define TRANSFER(ta, force_cctx) transfer (aTHX_ (ta).prev, (ta).next, (force_cctx))
1543#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next) 1667#define TRANSFER_CHECK(ta) transfer_check (aTHX_ (ta).prev, (ta).next)
1544 1668
1545/** high level stuff ********************************************************/ 1669/** high level stuff ********************************************************/
1546 1670
1547static int 1671static void
1548coro_state_destroy (pTHX_ struct coro *coro) 1672coro_state_destroy (pTHX_ struct coro *coro)
1549{ 1673{
1550 if (coro->flags & CF_DESTROYED) 1674 if (coro->flags & CF_DESTROYED)
1551 return 0; 1675 return;
1552 1676
1677 /* this callback is reserved for slf functions needing to do cleanup */
1553 if (coro->on_destroy && !PL_dirty) 1678 if (coro->on_destroy && !PL_dirty)
1554 coro->on_destroy (aTHX_ coro); 1679 coro->on_destroy (aTHX_ coro);
1680
1681 /*
1682 * The on_destroy above most likely is from an SLF call.
1683 * Since by definition the SLF call will not finish when we destroy
1684 * the coro, we will have to force-finish it here, otherwise
1685 * cleanup functions cannot call SLF functions.
1686 */
1687 coro->slf_frame.prepare = 0;
1555 1688
1556 coro->flags |= CF_DESTROYED; 1689 coro->flags |= CF_DESTROYED;
1557 1690
1558 if (coro->flags & CF_READY) 1691 if (coro->flags & CF_READY)
1559 { 1692 {
… …
1566 1699
1567 if (coro->mainstack 1700 if (coro->mainstack
1568 && coro->mainstack != main_mainstack 1701 && coro->mainstack != main_mainstack
1569 && coro->slot 1702 && coro->slot
1570 && !PL_dirty) 1703 && !PL_dirty)
1571 coro_destruct_perl (aTHX_ coro); 1704 destroy_perl (aTHX_ coro);
1705
1706 if (coro->next) coro->next->prev = coro->prev;
1707 if (coro->prev) coro->prev->next = coro->next;
1708 if (coro == coro_first) coro_first = coro->next;
1572 1709
1573 cctx_destroy (coro->cctx); 1710 cctx_destroy (coro->cctx);
1574 SvREFCNT_dec (coro->startcv); 1711 SvREFCNT_dec (coro->startcv);
1575 SvREFCNT_dec (coro->args); 1712 SvREFCNT_dec (coro->args);
1713 SvREFCNT_dec (coro->swap_sv);
1576 SvREFCNT_dec (CORO_THROW); 1714 SvREFCNT_dec (CORO_THROW);
1577
1578 if (coro->next) coro->next->prev = coro->prev;
1579 if (coro->prev) coro->prev->next = coro->next;
1580 if (coro == coro_first) coro_first = coro->next;
1581
1582 return 1;
1583} 1715}
1584 1716
1585static int 1717static int
1586coro_state_free (pTHX_ SV *sv, MAGIC *mg) 1718coro_state_free (pTHX_ SV *sv, MAGIC *mg)
1587{ 1719{
… …
1755 { 1887 {
1756 /* nothing to schedule: call the idle handler */ 1888 /* nothing to schedule: call the idle handler */
1757 if (SvROK (sv_idle) 1889 if (SvROK (sv_idle)
1758 && SvOBJECT (SvRV (sv_idle))) 1890 && SvOBJECT (SvRV (sv_idle)))
1759 { 1891 {
1892 if (SvRV (sv_idle) == SvRV (coro_current))
1893 croak ("FATAL: $Coro::IDLE blocked itself - did you try to block inside an event loop callback? Caught");
1894
1760 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */ 1895 ++coro_nready; /* hack so that api_ready doesn't invoke ready hook */
1761 api_ready (aTHX_ SvRV (sv_idle)); 1896 api_ready (aTHX_ SvRV (sv_idle));
1762 --coro_nready; 1897 --coro_nready;
1763 } 1898 }
1764 else 1899 else
1765 { 1900 {
1901 /* TODO: deprecated, remove, cannot work reliably *//*D*/
1766 dSP; 1902 dSP;
1767 1903
1768 ENTER; 1904 ENTER;
1769 SAVETMPS; 1905 SAVETMPS;
1770 1906
… …
1880 2016
1881static void 2017static void
1882coro_call_on_destroy (pTHX_ struct coro *coro) 2018coro_call_on_destroy (pTHX_ struct coro *coro)
1883{ 2019{
1884 SV **on_destroyp = hv_fetch (coro->hv, "_on_destroy", sizeof ("_on_destroy") - 1, 0); 2020 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 2021
1887 if (on_destroyp) 2022 if (on_destroyp)
1888 { 2023 {
1889 AV *on_destroy = (AV *)SvRV (*on_destroyp); 2024 SV **statusp = hv_fetch (coro->hv, "_status", sizeof ("_status") - 1, 0);
2025 AV *on_destroy = sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*on_destroyp)));
2026 AV *status = statusp ? sv_2mortal (SvREFCNT_inc ((AV *)SvRV (*statusp))) : 0;
1890 2027
1891 while (AvFILLp (on_destroy) >= 0) 2028 while (AvFILLp (on_destroy) >= 0)
1892 { 2029 {
1893 dSP; /* don't disturb outer sp */ 2030 dSP; /* don't disturb outer sp */
1894 SV *cb = av_pop (on_destroy); 2031 SV *cb = av_pop (on_destroy);
… …
1896 PUSHMARK (SP); 2033 PUSHMARK (SP);
1897 2034
1898 if (statusp) 2035 if (statusp)
1899 { 2036 {
1900 int i; 2037 int i;
1901 AV *status = (AV *)SvRV (*statusp);
1902 EXTEND (SP, AvFILLp (status) + 1); 2038 EXTEND (SP, AvFILLp (status) + 1);
1903 2039
1904 for (i = 0; i <= AvFILLp (status); ++i) 2040 for (i = 0; i <= AvFILLp (status); ++i)
1905 PUSHs (AvARRAY (status)[i]); 2041 PUSHs (AvARRAY (status)[i]);
1906 } 2042 }
… …
1910 } 2046 }
1911 } 2047 }
1912} 2048}
1913 2049
1914static void 2050static void
1915slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items) 2051coro_set_status (HV *coro_hv, SV **arg, int items)
1916{ 2052{
1917 int i;
1918 HV *hv = (HV *)SvRV (coro_current);
1919 AV *av = newAV (); 2053 AV *av = newAV ();
1920 2054
1921 /* items are actually not so common, so optimise for this case */ 2055 /* items are actually not so common, so optimise for this case */
1922 if (items) 2056 if (items)
1923 { 2057 {
2058 int i;
2059
1924 av_extend (av, items - 1); 2060 av_extend (av, items - 1);
1925 2061
1926 for (i = 0; i < items; ++i) 2062 for (i = 0; i < items; ++i)
1927 av_push (av, SvREFCNT_inc_NN (arg [i])); 2063 av_push (av, SvREFCNT_inc_NN (arg [i]));
1928 } 2064 }
1929 2065
1930 hv_store (hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0); 2066 hv_store (coro_hv, "_status", sizeof ("_status") - 1, newRV_noinc ((SV *)av), 0);
2067}
1931 2068
2069static void
2070slf_init_terminate_cancel_common (pTHX_ struct CoroSLF *frame, HV *coro_hv)
2071{
1932 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 2072 av_push (av_destroy, (SV *)newRV_inc ((SV *)coro_hv)); /* RVinc for perl */
1933 api_ready (aTHX_ sv_manager); 2073 api_ready (aTHX_ sv_manager);
1934 2074
1935 frame->prepare = prepare_schedule; 2075 frame->prepare = prepare_schedule;
1936 frame->check = slf_check_repeat; 2076 frame->check = slf_check_repeat;
1937 2077
1938 /* as a minor optimisation, we could unwind all stacks here */ 2078 /* as a minor optimisation, we could unwind all stacks here */
1939 /* but that puts extra pressure on pp_slf, and is not worth much */ 2079 /* but that puts extra pressure on pp_slf, and is not worth much */
1940 /*coro_unwind_stacks (aTHX);*/ 2080 /*coro_unwind_stacks (aTHX);*/
2081}
2082
2083static void
2084slf_init_terminate (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2085{
2086 HV *coro_hv = (HV *)SvRV (coro_current);
2087
2088 coro_set_status (coro_hv, arg, items);
2089 slf_init_terminate_cancel_common (frame, coro_hv);
2090}
2091
2092static void
2093slf_init_cancel (pTHX_ struct CoroSLF *frame, CV *cv, SV **arg, int items)
2094{
2095 HV *coro_hv;
2096 struct coro *coro;
2097
2098 if (items <= 0)
2099 croak ("Coro::cancel called without coro object,");
2100
2101 coro = SvSTATE (arg [0]);
2102 coro_hv = coro->hv;
2103
2104 coro_set_status (coro_hv, arg + 1, items - 1);
2105
2106 if (expect_false (coro->flags & CF_NOCANCEL))
2107 {
2108 /* coro currently busy cancelling something, so just notify it */
2109 coro->slf_frame.data = (void *)coro;
2110
2111 frame->prepare = prepare_nop;
2112 frame->check = slf_check_nop;
2113 }
2114 else if (coro_hv == (HV *)SvRV (coro_current))
2115 {
2116 /* cancelling the current coro is allowed, and equals terminate */
2117 slf_init_terminate_cancel_common (frame, coro_hv);
2118 }
2119 else
2120 {
2121 struct coro *self = SvSTATE_current;
2122
2123 /* otherwise we cancel directly, purely for speed reasons
2124 * unfortunately, this requires some magic trickery, as
2125 * somebody else could cancel us, so we have to fight the cancellation.
2126 * this is ugly, and hopefully fully worth the extra speed.
2127 * besides, I can't get the slow-but-safe version working...
2128 */
2129 slf_frame.data = 0;
2130 self->flags |= CF_NOCANCEL;
2131
2132 coro_state_destroy (aTHX_ coro);
2133 coro_call_on_destroy (aTHX_ coro);
2134
2135 self->flags &= ~CF_NOCANCEL;
2136
2137 if (slf_frame.data)
2138 {
2139 /* while we were busy we have been cancelled, so terminate */
2140 slf_init_terminate_cancel_common (frame, self->hv);
2141 }
2142 else
2143 {
2144 frame->prepare = prepare_nop;
2145 frame->check = slf_check_nop;
2146 }
2147 }
1941} 2148}
1942 2149
1943/*****************************************************************************/ 2150/*****************************************************************************/
1944/* async pool handler */ 2151/* async pool handler */
1945 2152
… …
2349 if (PL_op->op_flags & OPf_STACKED) 2556 if (PL_op->op_flags & OPf_STACKED)
2350 { 2557 {
2351 if (items > slf_arga) 2558 if (items > slf_arga)
2352 { 2559 {
2353 slf_arga = items; 2560 slf_arga = items;
2354 free (slf_argv); 2561 Safefree (slf_argv);
2355 slf_argv = malloc (slf_arga * sizeof (SV *)); 2562 New (0, slf_argv, slf_arga, SV *);
2356 } 2563 }
2357 2564
2358 slf_argc = items; 2565 slf_argc = items;
2359 2566
2360 for (i = 0; i < items; ++i) 2567 for (i = 0; i < items; ++i)
… …
2721 { 2928 {
2722 SV *cb_cv = s_get_cv_croak (arg [1]); 2929 SV *cb_cv = s_get_cv_croak (arg [1]);
2723 av_push (av, SvREFCNT_inc_NN (cb_cv)); 2930 av_push (av, SvREFCNT_inc_NN (cb_cv));
2724 2931
2725 if (SvIVX (AvARRAY (av)[0])) 2932 if (SvIVX (AvARRAY (av)[0]))
2726 coro_signal_wake (aTHX_ av, 1); /* ust be the only waiter */ 2933 coro_signal_wake (aTHX_ av, 1); /* must be the only waiter */
2727 2934
2728 frame->prepare = prepare_nop; 2935 frame->prepare = prepare_nop;
2729 frame->check = slf_check_nop; 2936 frame->check = slf_check_nop;
2730 } 2937 }
2731 else if (SvIVX (AvARRAY (av)[0])) 2938 else if (SvIVX (AvARRAY (av)[0]))
… …
2893 /* now call the AIO function - we assume our request is uncancelable */ 3100 /* now call the AIO function - we assume our request is uncancelable */
2894 PUTBACK; 3101 PUTBACK;
2895 call_sv ((SV *)req, G_VOID | G_DISCARD); 3102 call_sv ((SV *)req, G_VOID | G_DISCARD);
2896 } 3103 }
2897 3104
2898 /* now that the requets is going, we loop toll we have a result */ 3105 /* now that the request is going, we loop till we have a result */
2899 frame->data = (void *)state; 3106 frame->data = (void *)state;
2900 frame->prepare = prepare_schedule; 3107 frame->prepare = prepare_schedule;
2901 frame->check = slf_check_aio_req; 3108 frame->check = slf_check_aio_req;
2902} 3109}
2903 3110
… …
2918#endif 3125#endif
2919 3126
2920/*****************************************************************************/ 3127/*****************************************************************************/
2921 3128
2922static SV * 3129static SV *
2923coro_new (HV *stash, SV **argv, int argc, int is_coro) 3130coro_new (pTHX_ HV *stash, SV **argv, int argc, int is_coro)
2924{ 3131{
2925 SV *coro_sv; 3132 SV *coro_sv;
2926 struct coro *coro; 3133 struct coro *coro;
2927 MAGIC *mg; 3134 MAGIC *mg;
2928 HV *hv; 3135 HV *hv;
… …
3034 coroapi.prepare_nop = prepare_nop; 3241 coroapi.prepare_nop = prepare_nop;
3035 coroapi.prepare_schedule = prepare_schedule; 3242 coroapi.prepare_schedule = prepare_schedule;
3036 coroapi.prepare_cede = prepare_cede; 3243 coroapi.prepare_cede = prepare_cede;
3037 coroapi.prepare_cede_notself = prepare_cede_notself; 3244 coroapi.prepare_cede_notself = prepare_cede_notself;
3038 3245
3039 { 3246 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 3247
3051 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL)); 3248 assert (("PRIO_NORMAL must be 0", !CORO_PRIO_NORMAL));
3052} 3249}
3053 3250
3054SV * 3251SV *
3055new (SV *klass, ...) 3252new (SV *klass, ...)
3056 ALIAS: 3253 ALIAS:
3057 Coro::new = 1 3254 Coro::new = 1
3058 CODE: 3255 CODE:
3059 RETVAL = coro_new (ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix); 3256 RETVAL = coro_new (aTHX_ ix ? coro_stash : coro_state_stash, &ST (1), items - 1, ix);
3060 OUTPUT: 3257 OUTPUT:
3061 RETVAL 3258 RETVAL
3062 3259
3063void 3260void
3064transfer (...) 3261transfer (...)
3065 PROTOTYPE: $$ 3262 PROTOTYPE: $$
3066 CODE: 3263 CODE:
3067 CORO_EXECUTE_SLF_XS (slf_init_transfer); 3264 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 3265
3076void 3266void
3077_exit (int code) 3267_exit (int code)
3078 PROTOTYPE: $ 3268 PROTOTYPE: $
3079 CODE: 3269 CODE:
… …
3155 CODE: 3345 CODE:
3156{ 3346{
3157 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3347 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
3158 { 3348 {
3159 struct coro *current = SvSTATE_current; 3349 struct coro *current = SvSTATE_current;
3350 struct CoroSLF slf_save;
3160 3351
3161 if (current != coro) 3352 if (current != coro)
3162 { 3353 {
3163 PUTBACK; 3354 PUTBACK;
3164 save_perl (aTHX_ current); 3355 save_perl (aTHX_ current);
3165 load_perl (aTHX_ coro); 3356 load_perl (aTHX_ coro);
3357 /* the coro is most likely in an active SLF call.
3358 * while not strictly required (the code we execute is
3359 * not allowed to call any SLF functions), it's cleaner
3360 * to reinitialise the slf_frame and restore it later.
3361 * This might one day allow us to actually do SLF calls
3362 * from code executed here.
3363 */
3364 slf_save = slf_frame;
3365 slf_frame.prepare = 0;
3166 SPAGAIN; 3366 SPAGAIN;
3167 } 3367 }
3168 3368
3169 PUSHSTACK; 3369 PUSHSTACK;
3170 3370
… …
3180 SPAGAIN; 3380 SPAGAIN;
3181 3381
3182 if (current != coro) 3382 if (current != coro)
3183 { 3383 {
3184 PUTBACK; 3384 PUTBACK;
3385 slf_frame = slf_save;
3185 save_perl (aTHX_ coro); 3386 save_perl (aTHX_ coro);
3186 load_perl (aTHX_ current); 3387 load_perl (aTHX_ current);
3187 SPAGAIN; 3388 SPAGAIN;
3188 } 3389 }
3189 } 3390 }
… …
3202 RETVAL = boolSV (coro->flags & ix); 3403 RETVAL = boolSV (coro->flags & ix);
3203 OUTPUT: 3404 OUTPUT:
3204 RETVAL 3405 RETVAL
3205 3406
3206void 3407void
3207throw (Coro::State self, SV *throw = &PL_sv_undef) 3408throw (Coro::State self, SV *exception = &PL_sv_undef)
3208 PROTOTYPE: $;$ 3409 PROTOTYPE: $;$
3209 CODE: 3410 CODE:
3210{ 3411{
3211 struct coro *current = SvSTATE_current; 3412 struct coro *current = SvSTATE_current;
3212 SV **throwp = self == current ? &CORO_THROW : &self->except; 3413 SV **exceptionp = self == current ? &CORO_THROW : &self->except;
3213 SvREFCNT_dec (*throwp); 3414 SvREFCNT_dec (*exceptionp);
3214 SvGETMAGIC (throw); 3415 SvGETMAGIC (exception);
3215 *throwp = SvOK (throw) ? newSVsv (throw) : 0; 3416 *exceptionp = SvOK (exception) ? newSVsv (exception) : 0;
3216} 3417}
3217 3418
3218void 3419void
3219api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB) 3420api_trace (SV *coro, int flags = CC_TRACE | CC_TRACE_SUB)
3220 PROTOTYPE: $;$ 3421 PROTOTYPE: $;$
… …
3275 3476
3276void 3477void
3277cancel (Coro::State self) 3478cancel (Coro::State self)
3278 CODE: 3479 CODE:
3279 coro_state_destroy (aTHX_ self); 3480 coro_state_destroy (aTHX_ self);
3280 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3281
3282 3481
3283SV * 3482SV *
3284enable_times (int enabled = enable_times) 3483enable_times (int enabled = enable_times)
3285 CODE: 3484 CODE:
3286{ 3485{
… …
3314 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9))); 3513 PUSHs (sv_2mortal (newSVnv (self->t_cpu [0] + self->t_cpu [1] * 1e-9)));
3315 3514
3316 if (expect_false (current == self)) 3515 if (expect_false (current == self))
3317 coro_times_sub (SvSTATE (coro_current)); 3516 coro_times_sub (SvSTATE (coro_current));
3318} 3517}
3518
3519void
3520swap_sv (Coro::State coro, SV *sv, SV *swapsv)
3521 CODE:
3522{
3523 struct coro *current = SvSTATE_current;
3524
3525 if (current == coro)
3526 SWAP_SVS (current);
3527
3528 if (!coro->swap_sv)
3529 coro->swap_sv = newAV ();
3530
3531 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (sv )));
3532 av_push (coro->swap_sv, SvREFCNT_inc_NN (SvRV (swapsv)));
3533
3534 if (current == coro)
3535 SWAP_SVS (current);
3536}
3537
3319 3538
3320MODULE = Coro::State PACKAGE = Coro 3539MODULE = Coro::State PACKAGE = Coro
3321 3540
3322BOOT: 3541BOOT:
3323{ 3542{
… …
3332 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE); 3551 sv_idle = coro_get_sv (aTHX_ "Coro::idle" , TRUE);
3333 3552
3334 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle); 3553 sv_async_pool_idle = newSVpv ("[async pool idle]", 0); SvREADONLY_on (sv_async_pool_idle);
3335 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro); 3554 sv_Coro = newSVpv ("Coro", 0); SvREADONLY_on (sv_Coro);
3336 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler); 3555 cv_pool_handler = get_cv ("Coro::pool_handler", GV_ADD); SvREADONLY_on (cv_pool_handler);
3337 cv_coro_state_new = get_cv ("Coro::State::new", 0); SvREADONLY_on (cv_coro_state_new); 3556 CvNODEBUG_on (get_cv ("Coro::_pool_handler", 0)); /* work around a debugger bug */
3338 3557
3339 coro_stash = gv_stashpv ("Coro", TRUE); 3558 coro_stash = gv_stashpv ("Coro", TRUE);
3340 3559
3341 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX)); 3560 newCONSTSUB (coro_stash, "PRIO_MAX", newSViv (CORO_PRIO_MAX));
3342 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH)); 3561 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (CORO_PRIO_HIGH));
3343 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL)); 3562 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (CORO_PRIO_NORMAL));
… …
3365 3584
3366SV * 3585SV *
3367async (...) 3586async (...)
3368 PROTOTYPE: &@ 3587 PROTOTYPE: &@
3369 CODE: 3588 CODE:
3370 RETVAL = coro_new (coro_stash, &ST (0), items, 1); 3589 RETVAL = coro_new (aTHX_ coro_stash, &ST (0), items, 1);
3371 api_ready (RETVAL); 3590 api_ready (aTHX_ RETVAL);
3372 OUTPUT: 3591 OUTPUT:
3373 RETVAL 3592 RETVAL
3593
3594void
3595_destroy (Coro::State coro)
3596 CODE:
3597 /* used by the manager thread */
3598 coro_state_destroy (aTHX_ coro);
3599 coro_call_on_destroy (aTHX_ coro);
3374 3600
3375void 3601void
3376terminate (...) 3602terminate (...)
3377 CODE: 3603 CODE:
3378 CORO_EXECUTE_SLF_XS (slf_init_terminate); 3604 CORO_EXECUTE_SLF_XS (slf_init_terminate);
3605
3606void
3607cancel (...)
3608 CODE:
3609 CORO_EXECUTE_SLF_XS (slf_init_cancel);
3379 3610
3380void 3611void
3381schedule (...) 3612schedule (...)
3382 CODE: 3613 CODE:
3383 CORO_EXECUTE_SLF_XS (slf_init_schedule); 3614 CORO_EXECUTE_SLF_XS (slf_init_schedule);
… …
3496 for (i = 1; i < items; ++i) 3727 for (i = 1; i < items; ++i)
3497 av_push (av, SvREFCNT_inc_NN (ST (i))); 3728 av_push (av, SvREFCNT_inc_NN (ST (i)));
3498 3729
3499 if ((SV *)hv == &PL_sv_undef) 3730 if ((SV *)hv == &PL_sv_undef)
3500 { 3731 {
3501 PUSHMARK (SP); 3732 SV *sv = coro_new (aTHX_ coro_stash, (SV **)&cv_pool_handler, 1, 1);
3502 EXTEND (SP, 2);
3503 PUSHs (sv_Coro);
3504 PUSHs ((SV *)cv_pool_handler);
3505 PUTBACK;
3506 call_sv ((SV *)cv_coro_state_new, G_SCALAR);
3507 SPAGAIN;
3508
3509 hv = (HV *)SvREFCNT_inc_NN (SvRV (POPs)); 3733 hv = (HV *)SvREFCNT_inc_NN (SvRV (sv));
3734 SvREFCNT_dec (sv);
3510 } 3735 }
3511 3736
3512 { 3737 {
3513 struct coro *coro = SvSTATE_hv (hv); 3738 struct coro *coro = SvSTATE_hv (hv);
3514 3739
… …
3786 { 4011 {
3787 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect; 4012 PL_ppaddr [OP_SSELECT] = coro_old_pp_sselect;
3788 coro_old_pp_sselect = 0; 4013 coro_old_pp_sselect = 0;
3789 } 4014 }
3790 4015
3791

Diff Legend

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