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.327 by root, Mon Nov 24 06:07:16 2008 UTC vs.
Revision 1.350 by root, Sat Jun 20 08:58:00 2009 UTC

133#else 133#else
134# define dSTACKLEVEL volatile void *stacklevel 134# define dSTACKLEVEL volatile void *stacklevel
135# define STACKLEVEL ((void *)&stacklevel) 135# define STACKLEVEL ((void *)&stacklevel)
136#endif 136#endif
137 137
138#define IN_DESTRUCT (PL_main_cv == Nullcv) 138#define IN_DESTRUCT PL_dirty
139 139
140#if __GNUC__ >= 3 140#if __GNUC__ >= 3
141# define attribute(x) __attribute__(x) 141# define attribute(x) __attribute__(x)
142# define expect(expr,value) __builtin_expect ((expr),(value)) 142# define expect(expr,value) __builtin_expect ((expr),(value))
143# define INLINE static inline 143# define INLINE static inline
238enum { 238enum {
239 CF_RUNNING = 0x0001, /* coroutine is running */ 239 CF_RUNNING = 0x0001, /* coroutine is running */
240 CF_READY = 0x0002, /* coroutine is ready */ 240 CF_READY = 0x0002, /* coroutine is ready */
241 CF_NEW = 0x0004, /* has never been switched to */ 241 CF_NEW = 0x0004, /* has never been switched to */
242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */ 242 CF_DESTROYED = 0x0008, /* coroutine data has been freed */
243 CF_SUSPENDED = 0x0010, /* coroutine can't be scheduled */
243}; 244};
244 245
245/* the structure where most of the perl state is stored, overlaid on the cxstack */ 246/* the structure where most of the perl state is stored, overlaid on the cxstack */
246typedef struct 247typedef struct
247{ 248{
260/* this is a structure representing a perl-level coroutine */ 261/* this is a structure representing a perl-level coroutine */
261struct coro { 262struct coro {
262 /* the C coroutine allocated to this perl coroutine, if any */ 263 /* the C coroutine allocated to this perl coroutine, if any */
263 coro_cctx *cctx; 264 coro_cctx *cctx;
264 265
266 /* ready queue */
267 struct coro *next_ready;
268
265 /* state data */ 269 /* state data */
266 struct CoroSLF slf_frame; /* saved slf frame */ 270 struct CoroSLF slf_frame; /* saved slf frame */
267 AV *mainstack; 271 AV *mainstack;
268 perl_slots *slot; /* basically the saved sp */ 272 perl_slots *slot; /* basically the saved sp */
269 273
285 /* async_pool */ 289 /* async_pool */
286 SV *saved_deffh; 290 SV *saved_deffh;
287 SV *invoke_cb; 291 SV *invoke_cb;
288 AV *invoke_av; 292 AV *invoke_av;
289 293
294 /* on_enter/on_leave */
295 AV *on_enter;
296 AV *on_leave;
297
290 /* linked list */ 298 /* linked list */
291 struct coro *next, *prev; 299 struct coro *next, *prev;
292}; 300};
293 301
294typedef struct coro *Coro__State; 302typedef struct coro *Coro__State;
309#define PRIO_MIN -4 317#define PRIO_MIN -4
310 318
311/* for Coro.pm */ 319/* for Coro.pm */
312static SV *coro_current; 320static SV *coro_current;
313static SV *coro_readyhook; 321static SV *coro_readyhook;
314static AV *coro_ready [PRIO_MAX - PRIO_MIN + 1]; 322static struct coro *coro_ready [PRIO_MAX - PRIO_MIN + 1][2]; /* head|tail */
315static CV *cv_coro_run, *cv_coro_terminate; 323static CV *cv_coro_run, *cv_coro_terminate;
316static struct coro *coro_first; 324static struct coro *coro_first;
317#define coro_nready coroapi.nready 325#define coro_nready coroapi.nready
318 326
319/** lowlevel stuff **********************************************************/ 327/** lowlevel stuff **********************************************************/
352INLINE CV * 360INLINE CV *
353coro_sv_2cv (pTHX_ SV *sv) 361coro_sv_2cv (pTHX_ SV *sv)
354{ 362{
355 HV *st; 363 HV *st;
356 GV *gvp; 364 GV *gvp;
357 return sv_2cv (sv, &st, &gvp, 0); 365 CV *cv = sv_2cv (sv, &st, &gvp, 0);
366
367 if (!cv)
368 croak ("code reference expected");
369
370 return cv;
358} 371}
372
373/*****************************************************************************/
374/* magic glue */
375
376#define CORO_MAGIC_type_cv 26
377#define CORO_MAGIC_type_state PERL_MAGIC_ext
378
379#define CORO_MAGIC_NN(sv, type) \
380 (expect_true (SvMAGIC (sv)->mg_type == type) \
381 ? SvMAGIC (sv) \
382 : mg_find (sv, type))
383
384#define CORO_MAGIC(sv, type) \
385 (expect_true (SvMAGIC (sv)) \
386 ? CORO_MAGIC_NN (sv, type) \
387 : 0)
388
389#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
390#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
391
392INLINE struct coro *
393SvSTATE_ (pTHX_ SV *coro)
394{
395 HV *stash;
396 MAGIC *mg;
397
398 if (SvROK (coro))
399 coro = SvRV (coro);
400
401 if (expect_false (SvTYPE (coro) != SVt_PVHV))
402 croak ("Coro::State object required");
403
404 stash = SvSTASH (coro);
405 if (expect_false (stash != coro_stash && stash != coro_state_stash))
406 {
407 /* very slow, but rare, check */
408 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
409 croak ("Coro::State object required");
410 }
411
412 mg = CORO_MAGIC_state (coro);
413 return (struct coro *)mg->mg_ptr;
414}
415
416#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
417
418/* faster than SvSTATE, but expects a coroutine hv */
419#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
420#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
421
422/*****************************************************************************/
423/* padlist management and caching */
359 424
360static AV * 425static AV *
361coro_derive_padlist (pTHX_ CV *cv) 426coro_derive_padlist (pTHX_ CV *cv)
362{ 427{
363 AV *padlist = CvPADLIST (cv); 428 AV *padlist = CvPADLIST (cv);
371 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 436 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
372#endif 437#endif
373 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 438 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
374 --AvFILLp (padlist); 439 --AvFILLp (padlist);
375 440
376 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 441 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
377 av_store (newpadlist, 1, (SV *)newpad); 442 av_store (newpadlist, 1, (SV *)newpad);
378 443
379 return newpadlist; 444 return newpadlist;
380} 445}
381 446
382static void 447static void
383free_padlist (pTHX_ AV *padlist) 448free_padlist (pTHX_ AV *padlist)
384{ 449{
385 /* may be during global destruction */ 450 /* may be during global destruction */
386 if (SvREFCNT (padlist)) 451 if (!IN_DESTRUCT)
387 { 452 {
388 I32 i = AvFILLp (padlist); 453 I32 i = AvFILLp (padlist);
389 while (i >= 0) 454
455 while (i > 0) /* special-case index 0 */
390 { 456 {
391 SV **svp = av_fetch (padlist, i--, FALSE); 457 /* we try to be extra-careful here */
392 if (svp) 458 AV *av = (AV *)AvARRAY (padlist)[i--];
393 { 459 I32 j = AvFILLp (av);
394 SV *sv; 460
395 while (&PL_sv_undef != (sv = av_pop ((AV *)*svp))) 461 while (j >= 0)
462 SvREFCNT_dec (AvARRAY (av)[j--]);
463
464 AvFILLp (av) = -1;
396 SvREFCNT_dec (sv); 465 SvREFCNT_dec (av);
397
398 SvREFCNT_dec (*svp);
399 }
400 } 466 }
401 467
468 SvREFCNT_dec (AvARRAY (padlist)[0]);
469
470 AvFILLp (padlist) = -1;
402 SvREFCNT_dec ((SV*)padlist); 471 SvREFCNT_dec ((SV*)padlist);
403 } 472 }
404} 473}
405 474
406static int 475static int
415 484
416 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 485 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
417 486
418 return 0; 487 return 0;
419} 488}
420
421#define CORO_MAGIC_type_cv 26
422#define CORO_MAGIC_type_state PERL_MAGIC_ext
423 489
424static MGVTBL coro_cv_vtbl = { 490static MGVTBL coro_cv_vtbl = {
425 0, 0, 0, 0, 491 0, 0, 0, 0,
426 coro_cv_free 492 coro_cv_free
427}; 493};
428
429#define CORO_MAGIC_NN(sv, type) \
430 (expect_true (SvMAGIC (sv)->mg_type == type) \
431 ? SvMAGIC (sv) \
432 : mg_find (sv, type))
433
434#define CORO_MAGIC(sv, type) \
435 (expect_true (SvMAGIC (sv)) \
436 ? CORO_MAGIC_NN (sv, type) \
437 : 0)
438
439#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
440#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
441
442INLINE struct coro *
443SvSTATE_ (pTHX_ SV *coro)
444{
445 HV *stash;
446 MAGIC *mg;
447
448 if (SvROK (coro))
449 coro = SvRV (coro);
450
451 if (expect_false (SvTYPE (coro) != SVt_PVHV))
452 croak ("Coro::State object required");
453
454 stash = SvSTASH (coro);
455 if (expect_false (stash != coro_stash && stash != coro_state_stash))
456 {
457 /* very slow, but rare, check */
458 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
459 croak ("Coro::State object required");
460 }
461
462 mg = CORO_MAGIC_state (coro);
463 return (struct coro *)mg->mg_ptr;
464}
465
466#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
467
468/* faster than SvSTATE, but expects a coroutine hv */
469#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
470#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
471 494
472/* the next two functions merely cache the padlists */ 495/* the next two functions merely cache the padlists */
473static void 496static void
474get_padlist (pTHX_ CV *cv) 497get_padlist (pTHX_ CV *cv)
475{ 498{
503 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0); 526 mg = sv_magicext ((SV *)cv, (SV *)newAV (), CORO_MAGIC_type_cv, &coro_cv_vtbl, 0, 0);
504 527
505 av = (AV *)mg->mg_obj; 528 av = (AV *)mg->mg_obj;
506 529
507 if (expect_false (AvFILLp (av) >= AvMAX (av))) 530 if (expect_false (AvFILLp (av) >= AvMAX (av)))
508 av_extend (av, AvMAX (av) + 1); 531 av_extend (av, AvFILLp (av) + 1);
509 532
510 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 533 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
511} 534}
512 535
513/** load & save, init *******************************************************/ 536/** load & save, init *******************************************************/
537
538static void
539on_enterleave_call (pTHX_ SV *cb);
514 540
515static void 541static void
516load_perl (pTHX_ Coro__State c) 542load_perl (pTHX_ Coro__State c)
517{ 543{
518 perl_slots *slot = c->slot; 544 perl_slots *slot = c->slot;
546 PUTBACK; 572 PUTBACK;
547 } 573 }
548 574
549 slf_frame = c->slf_frame; 575 slf_frame = c->slf_frame;
550 CORO_THROW = c->except; 576 CORO_THROW = c->except;
577
578 if (expect_false (c->on_enter))
579 {
580 int i;
581
582 for (i = 0; i <= AvFILLp (c->on_enter); ++i)
583 on_enterleave_call (aTHX_ AvARRAY (c->on_enter)[i]);
584 }
551} 585}
552 586
553static void 587static void
554save_perl (pTHX_ Coro__State c) 588save_perl (pTHX_ Coro__State c)
555{ 589{
590 if (expect_false (c->on_leave))
591 {
592 int i;
593
594 for (i = AvFILLp (c->on_leave); i >= 0; --i)
595 on_enterleave_call (aTHX_ AvARRAY (c->on_leave)[i]);
596 }
597
556 c->except = CORO_THROW; 598 c->except = CORO_THROW;
557 c->slf_frame = slf_frame; 599 c->slf_frame = slf_frame;
558 600
559 { 601 {
560 dSP; 602 dSP;
759#endif 801#endif
760 802
761/* 803/*
762 * This overrides the default magic get method of %SIG elements. 804 * This overrides the default magic get method of %SIG elements.
763 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook 805 * The original one doesn't provide for reading back of PL_diehook/PL_warnhook
764 * and instead of tryign to save and restore the hash elements, we just provide 806 * and instead of trying to save and restore the hash elements, we just provide
765 * readback here. 807 * readback here.
766 * We only do this when the hook is != 0, as they are often set to 0 temporarily,
767 * not expecting this to actually change the hook. This is a potential problem
768 * when a schedule happens then, but we ignore this.
769 */ 808 */
770static int 809static int
771coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg) 810coro_sigelem_get (pTHX_ SV *sv, MAGIC *mg)
772{ 811{
773 const char *s = MgPV_nolen_const (mg); 812 const char *s = MgPV_nolen_const (mg);
826 if (strEQ (s, "__WARN__")) svp = &PL_warnhook; 865 if (strEQ (s, "__WARN__")) svp = &PL_warnhook;
827 866
828 if (svp) 867 if (svp)
829 { 868 {
830 SV *old = *svp; 869 SV *old = *svp;
831 *svp = newSVsv (sv); 870 *svp = SvOK (sv) ? newSVsv (sv) : 0;
832 SvREFCNT_dec (old); 871 SvREFCNT_dec (old);
833 return 0; 872 return 0;
834 } 873 }
835 } 874 }
836 875
928 /* copy throw, in case it was set before coro_setup */ 967 /* copy throw, in case it was set before coro_setup */
929 CORO_THROW = coro->except; 968 CORO_THROW = coro->except;
930} 969}
931 970
932static void 971static void
933coro_destruct (pTHX_ struct coro *coro) 972coro_unwind_stacks (pTHX)
934{ 973{
935 if (!IN_DESTRUCT) 974 if (!IN_DESTRUCT)
936 { 975 {
937 /* restore all saved variables and stuff */ 976 /* restore all saved variables and stuff */
938 LEAVE_SCOPE (0); 977 LEAVE_SCOPE (0);
946 POPSTACK_TO (PL_mainstack); 985 POPSTACK_TO (PL_mainstack);
947 986
948 /* unwind main stack */ 987 /* unwind main stack */
949 dounwind (-1); 988 dounwind (-1);
950 } 989 }
990}
951 991
952 SvREFCNT_dec (GvSV (PL_defgv)); 992static void
953 SvREFCNT_dec (GvAV (PL_defgv)); 993coro_destruct_perl (pTHX_ struct coro *coro)
954 SvREFCNT_dec (GvSV (PL_errgv)); 994{
955 SvREFCNT_dec (PL_defoutgv); 995 SV *svf [9];
956 SvREFCNT_dec (PL_rs);
957 SvREFCNT_dec (GvSV (irsgv));
958 SvREFCNT_dec (GvHV (PL_hintgv));
959 996
960 SvREFCNT_dec (PL_diehook);
961 SvREFCNT_dec (PL_warnhook);
962 997 {
998 struct coro *current = SvSTATE_current;
999
1000 assert (("FATAL: tried to destroy currently running coroutine", coro->mainstack != PL_mainstack));
1001
1002 save_perl (aTHX_ current);
1003 load_perl (aTHX_ coro);
1004 coro_unwind_stacks (aTHX);
1005 coro_destruct_stacks (aTHX);
1006
1007 // now save some sv's to be free'd later
1008 svf [0] = GvSV (PL_defgv);
1009 svf [1] = (SV *)GvAV (PL_defgv);
1010 svf [2] = GvSV (PL_errgv);
1011 svf [3] = (SV *)PL_defoutgv;
1012 svf [4] = PL_rs;
1013 svf [5] = GvSV (irsgv);
1014 svf [6] = (SV *)GvHV (PL_hintgv);
1015 svf [7] = PL_diehook;
1016 svf [8] = PL_warnhook;
1017
1018 assert (9 == sizeof (svf) / sizeof (*svf));
1019
1020 load_perl (aTHX_ current);
1021 }
1022
1023 {
1024 int i;
1025
1026 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1027 SvREFCNT_dec (svf [i]);
1028
963 SvREFCNT_dec (coro->saved_deffh); 1029 SvREFCNT_dec (coro->saved_deffh);
964 SvREFCNT_dec (coro->rouse_cb); 1030 SvREFCNT_dec (coro->rouse_cb);
965 SvREFCNT_dec (coro->invoke_cb); 1031 SvREFCNT_dec (coro->invoke_cb);
966 SvREFCNT_dec (coro->invoke_av); 1032 SvREFCNT_dec (coro->invoke_av);
967 1033 }
968 coro_destruct_stacks (aTHX);
969} 1034}
970 1035
971INLINE void 1036INLINE void
972free_coro_mortal (pTHX) 1037free_coro_mortal (pTHX)
973{ 1038{
1178 /* 1243 /*
1179 * If perl-run returns we assume exit() was being called or the coro 1244 * If perl-run returns we assume exit() was being called or the coro
1180 * fell off the end, which seems to be the only valid (non-bug) 1245 * fell off the end, which seems to be the only valid (non-bug)
1181 * reason for perl_run to return. We try to exit by jumping to the 1246 * reason for perl_run to return. We try to exit by jumping to the
1182 * bootstrap-time "top" top_env, as we cannot restore the "main" 1247 * bootstrap-time "top" top_env, as we cannot restore the "main"
1183 * coroutine as Coro has no such concept 1248 * coroutine as Coro has no such concept.
1249 * This actually isn't valid with the pthread backend, but OSes requiring
1250 * that backend are too broken to do it in a standards-compliant way.
1184 */ 1251 */
1185 PL_top_env = main_top_env; 1252 PL_top_env = main_top_env;
1186 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */ 1253 JMPENV_JUMP (2); /* I do not feel well about the hardcoded 2 at all */
1187 } 1254 }
1188} 1255}
1265cctx_destroy (coro_cctx *cctx) 1332cctx_destroy (coro_cctx *cctx)
1266{ 1333{
1267 if (!cctx) 1334 if (!cctx)
1268 return; 1335 return;
1269 1336
1270 assert (cctx != cctx_current);//D temporary 1337 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1271 1338
1272 --cctx_count; 1339 --cctx_count;
1273 coro_destroy (&cctx->cctx); 1340 coro_destroy (&cctx->cctx);
1274 1341
1275 /* coro_transfer creates new, empty cctx's */ 1342 /* coro_transfer creates new, empty cctx's */
1339 /* TODO: throwing up here is considered harmful */ 1406 /* TODO: throwing up here is considered harmful */
1340 1407
1341 if (expect_true (prev != next)) 1408 if (expect_true (prev != next))
1342 { 1409 {
1343 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1410 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1344 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1411 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1345 1412
1346 if (expect_false (next->flags & CF_RUNNING))
1347 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1348
1349 if (expect_false (next->flags & CF_DESTROYED)) 1413 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1350 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1414 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1351 1415
1352#if !PERL_VERSION_ATLEAST (5,10,0) 1416#if !PERL_VERSION_ATLEAST (5,10,0)
1353 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1417 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1354 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1418 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1355#endif 1419#endif
1393 coro_setup (aTHX_ next); 1457 coro_setup (aTHX_ next);
1394 } 1458 }
1395 else 1459 else
1396 load_perl (aTHX_ next); 1460 load_perl (aTHX_ next);
1397 1461
1398 assert (!prev->cctx);//D temporary
1399
1400 /* possibly untie and reuse the cctx */ 1462 /* possibly untie and reuse the cctx */
1401 if (expect_true ( 1463 if (expect_true (
1402 cctx_current->idle_sp == STACKLEVEL 1464 cctx_current->idle_sp == STACKLEVEL
1403 && !(cctx_current->flags & CC_TRACE) 1465 && !(cctx_current->flags & CC_TRACE)
1404 && !force_cctx 1466 && !force_cctx
1445coro_state_destroy (pTHX_ struct coro *coro) 1507coro_state_destroy (pTHX_ struct coro *coro)
1446{ 1508{
1447 if (coro->flags & CF_DESTROYED) 1509 if (coro->flags & CF_DESTROYED)
1448 return 0; 1510 return 0;
1449 1511
1450 if (coro->on_destroy) 1512 if (coro->on_destroy && !PL_dirty)
1451 coro->on_destroy (aTHX_ coro); 1513 coro->on_destroy (aTHX_ coro);
1452 1514
1453 coro->flags |= CF_DESTROYED; 1515 coro->flags |= CF_DESTROYED;
1454 1516
1455 if (coro->flags & CF_READY) 1517 if (coro->flags & CF_READY)
1459 --coro_nready; 1521 --coro_nready;
1460 } 1522 }
1461 else 1523 else
1462 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1524 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1463 1525
1464 if (coro->mainstack && coro->mainstack != main_mainstack) 1526 if (coro->mainstack
1465 { 1527 && coro->mainstack != main_mainstack
1466 struct coro temp; 1528 && coro->slot
1467 1529 && !PL_dirty)
1468 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1469
1470 save_perl (aTHX_ &temp);
1471 load_perl (aTHX_ coro);
1472
1473 coro_destruct (aTHX_ coro); 1530 coro_destruct_perl (aTHX_ coro);
1474
1475 load_perl (aTHX_ &temp);
1476
1477 coro->slot = 0;
1478 }
1479 1531
1480 cctx_destroy (coro->cctx); 1532 cctx_destroy (coro->cctx);
1481 SvREFCNT_dec (coro->startcv); 1533 SvREFCNT_dec (coro->startcv);
1482 SvREFCNT_dec (coro->args); 1534 SvREFCNT_dec (coro->args);
1483 SvREFCNT_dec (CORO_THROW); 1535 SvREFCNT_dec (CORO_THROW);
1570/** Coro ********************************************************************/ 1622/** Coro ********************************************************************/
1571 1623
1572INLINE void 1624INLINE void
1573coro_enq (pTHX_ struct coro *coro) 1625coro_enq (pTHX_ struct coro *coro)
1574{ 1626{
1575 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1627 struct coro **ready = coro_ready [coro->prio - PRIO_MIN];
1576}
1577 1628
1578INLINE SV * 1629 SvREFCNT_inc_NN (coro->hv);
1630
1631 coro->next_ready = 0;
1632 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1633 ready [1] = coro;
1634}
1635
1636INLINE struct coro *
1579coro_deq (pTHX) 1637coro_deq (pTHX)
1580{ 1638{
1581 int prio; 1639 int prio;
1582 1640
1583 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1641 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1584 if (AvFILLp (coro_ready [prio]) >= 0) 1642 {
1585 return av_shift (coro_ready [prio]); 1643 struct coro **ready = coro_ready [prio];
1644
1645 if (ready [0])
1646 {
1647 struct coro *coro = ready [0];
1648 ready [0] = coro->next_ready;
1649 return coro;
1650 }
1651 }
1586 1652
1587 return 0; 1653 return 0;
1588} 1654}
1589 1655
1590static int 1656static int
1654static void 1720static void
1655prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1721prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1656{ 1722{
1657 for (;;) 1723 for (;;)
1658 { 1724 {
1659 SV *next_sv = coro_deq (aTHX); 1725 struct coro *next = coro_deq (aTHX);
1660 1726
1661 if (expect_true (next_sv)) 1727 if (expect_true (next))
1662 { 1728 {
1663 struct coro *next = SvSTATE_hv (next_sv);
1664
1665 /* cannot transfer to destroyed coros, skip and look for next */ 1729 /* cannot transfer to destroyed coros, skip and look for next */
1666 if (expect_false (next->flags & CF_DESTROYED)) 1730 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1667 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1731 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1668 else 1732 else
1669 { 1733 {
1670 next->flags &= ~CF_READY; 1734 next->flags &= ~CF_READY;
1671 --coro_nready; 1735 --coro_nready;
1672 1736
1850 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 1914 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1851 api_ready (aTHX_ sv_manager); 1915 api_ready (aTHX_ sv_manager);
1852 1916
1853 frame->prepare = prepare_schedule; 1917 frame->prepare = prepare_schedule;
1854 frame->check = slf_check_repeat; 1918 frame->check = slf_check_repeat;
1919
1920 /* as a minor optimisation, we could unwind all stacks here */
1921 /* but that puts extra pressure on pp_slf, and is not worth much */
1922 /*coro_unwind_stacks (aTHX);*/
1855} 1923}
1856 1924
1857/*****************************************************************************/ 1925/*****************************************************************************/
1858/* async pool handler */ 1926/* async pool handler */
1859 1927
1942 SV *data = (SV *)GENSUB_ARG; 2010 SV *data = (SV *)GENSUB_ARG;
1943 2011
1944 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2012 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1945 { 2013 {
1946 /* first call, set args */ 2014 /* first call, set args */
2015 SV *coro = SvRV (data);
1947 AV *av = newAV (); 2016 AV *av = newAV ();
1948 SV *coro = SvRV (data);
1949 2017
1950 SvRV_set (data, (SV *)av); 2018 SvRV_set (data, (SV *)av);
1951 api_ready (aTHX_ coro);
1952 SvREFCNT_dec (coro);
1953 2019
1954 /* better take a full copy of the arguments */ 2020 /* better take a full copy of the arguments */
1955 while (items--) 2021 while (items--)
1956 av_store (av, items, newSVsv (ST (items))); 2022 av_store (av, items, newSVsv (ST (items)));
2023
2024 api_ready (aTHX_ coro);
2025 SvREFCNT_dec (coro);
1957 } 2026 }
1958 2027
1959 XSRETURN_EMPTY; 2028 XSRETURN_EMPTY;
1960} 2029}
1961 2030
1978 2047
1979 EXTEND (SP, AvFILLp (av) + 1); 2048 EXTEND (SP, AvFILLp (av) + 1);
1980 for (i = 0; i <= AvFILLp (av); ++i) 2049 for (i = 0; i <= AvFILLp (av); ++i)
1981 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2050 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1982 2051
1983 /* we have stolen the elements, so ste length to zero and free */ 2052 /* we have stolen the elements, so set length to zero and free */
1984 AvFILLp (av) = -1; 2053 AvFILLp (av) = -1;
1985 av_undef (av); 2054 av_undef (av);
1986 2055
1987 PUTBACK; 2056 PUTBACK;
1988 } 2057 }
2278 2347
2279 PL_op->op_ppaddr = pp_slf; 2348 PL_op->op_ppaddr = pp_slf;
2280 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2349 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2281 2350
2282 PL_op = (OP *)&slf_restore; 2351 PL_op = (OP *)&slf_restore;
2352}
2353
2354/*****************************************************************************/
2355/* dynamic wind */
2356
2357static void
2358on_enterleave_call (pTHX_ SV *cb)
2359{
2360 dSP;
2361
2362 PUSHSTACK;
2363
2364 PUSHMARK (SP);
2365 PUTBACK;
2366 call_sv (cb, G_VOID | G_DISCARD);
2367 SPAGAIN;
2368
2369 POPSTACK;
2370}
2371
2372static SV *
2373coro_avp_pop_and_free (pTHX_ AV **avp)
2374{
2375 AV *av = *avp;
2376 SV *res = av_pop (av);
2377
2378 if (AvFILLp (av) < 0)
2379 {
2380 *avp = 0;
2381 SvREFCNT_dec (av);
2382 }
2383
2384 return res;
2385}
2386
2387static void
2388coro_pop_on_enter (pTHX_ void *coro)
2389{
2390 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2391 SvREFCNT_dec (cb);
2392}
2393
2394static void
2395coro_pop_on_leave (pTHX_ void *coro)
2396{
2397 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2398 on_enterleave_call (aTHX_ sv_2mortal (cb));
2283} 2399}
2284 2400
2285/*****************************************************************************/ 2401/*****************************************************************************/
2286/* PerlIO::cede */ 2402/* PerlIO::cede */
2287 2403
2368 SV **ary; 2484 SV **ary;
2369 2485
2370 /* unfortunately, building manually saves memory */ 2486 /* unfortunately, building manually saves memory */
2371 Newx (ary, 2, SV *); 2487 Newx (ary, 2, SV *);
2372 AvALLOC (av) = ary; 2488 AvALLOC (av) = ary;
2489#if PERL_VERSION_ATLEAST (5,10,0)
2373 /*AvARRAY (av) = ary;*/ 2490 AvARRAY (av) = ary;
2491#else
2374 SvPVX ((SV *)av) = (char *)ary; /* 5.8.8 needs this syntax instead of AvARRAY = ary */ 2492 /* 5.8.8 needs this syntax instead of AvARRAY = ary, yet */
2493 /* -DDEBUGGING flags this as a bug, despite it perfectly working */
2494 SvPVX ((SV *)av) = (char *)ary;
2495#endif
2375 AvMAX (av) = 1; 2496 AvMAX (av) = 1;
2376 AvFILLp (av) = 0; 2497 AvFILLp (av) = 0;
2377 ary [0] = newSViv (count); 2498 ary [0] = newSViv (count);
2378 2499
2379 return newRV_noinc ((SV *)av); 2500 return newRV_noinc ((SV *)av);
2908SV * 3029SV *
2909clone (Coro::State coro) 3030clone (Coro::State coro)
2910 CODE: 3031 CODE:
2911{ 3032{
2912#if CORO_CLONE 3033#if CORO_CLONE
2913 struct coro *ncoro = coro_clone (coro); 3034 struct coro *ncoro = coro_clone (aTHX_ coro);
2914 MAGIC *mg; 3035 MAGIC *mg;
2915 /* TODO: too much duplication */ 3036 /* TODO: too much duplication */
2916 ncoro->hv = newHV (); 3037 ncoro->hv = newHV ();
2917 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3038 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2918 mg->mg_flags |= MGf_DUP; 3039 mg->mg_flags |= MGf_DUP;
2980 eval = 1 3101 eval = 1
2981 CODE: 3102 CODE:
2982{ 3103{
2983 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3104 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2984 { 3105 {
2985 struct coro temp; 3106 struct coro *current = SvSTATE_current;
2986 3107
2987 if (!(coro->flags & CF_RUNNING)) 3108 if (current != coro)
2988 { 3109 {
2989 PUTBACK; 3110 PUTBACK;
2990 save_perl (aTHX_ &temp); 3111 save_perl (aTHX_ current);
2991 load_perl (aTHX_ coro); 3112 load_perl (aTHX_ coro);
3113 SPAGAIN;
2992 } 3114 }
2993 3115
2994 {
2995 dSP;
2996 ENTER;
2997 SAVETMPS;
2998 PUTBACK;
2999 PUSHSTACK; 3116 PUSHSTACK;
3117
3000 PUSHMARK (SP); 3118 PUSHMARK (SP);
3119 PUTBACK;
3001 3120
3002 if (ix) 3121 if (ix)
3003 eval_sv (coderef, 0); 3122 eval_sv (coderef, 0);
3004 else 3123 else
3005 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3124 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3006 3125
3007 POPSTACK; 3126 POPSTACK;
3008 SPAGAIN; 3127 SPAGAIN;
3009 FREETMPS;
3010 LEAVE;
3011 PUTBACK;
3012 }
3013 3128
3014 if (!(coro->flags & CF_RUNNING)) 3129 if (current != coro)
3015 { 3130 {
3131 PUTBACK;
3016 save_perl (aTHX_ coro); 3132 save_perl (aTHX_ coro);
3017 load_perl (aTHX_ &temp); 3133 load_perl (aTHX_ current);
3018 SPAGAIN; 3134 SPAGAIN;
3019 } 3135 }
3020 } 3136 }
3021} 3137}
3022 3138
3026 ALIAS: 3142 ALIAS:
3027 is_ready = CF_READY 3143 is_ready = CF_READY
3028 is_running = CF_RUNNING 3144 is_running = CF_RUNNING
3029 is_new = CF_NEW 3145 is_new = CF_NEW
3030 is_destroyed = CF_DESTROYED 3146 is_destroyed = CF_DESTROYED
3147 is_suspended = CF_SUSPENDED
3031 CODE: 3148 CODE:
3032 RETVAL = boolSV (coro->flags & ix); 3149 RETVAL = boolSV (coro->flags & ix);
3033 OUTPUT: 3150 OUTPUT:
3034 RETVAL 3151 RETVAL
3035 3152
3100 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3217 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3101 3218
3102 SV *tmp = *src; *src = *dst; *dst = tmp; 3219 SV *tmp = *src; *src = *dst; *dst = tmp;
3103 } 3220 }
3104 3221
3222void
3223cancel (Coro::State self)
3224 CODE:
3225 coro_state_destroy (aTHX_ self);
3226 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3227
3105 3228
3106MODULE = Coro::State PACKAGE = Coro 3229MODULE = Coro::State PACKAGE = Coro
3107 3230
3108BOOT: 3231BOOT:
3109{ 3232{
3110 int i;
3111
3112 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3233 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3113 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3234 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3114 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3235 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3115 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3236 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3116 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3237 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3117 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3238 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3118 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3239 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3119 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3240 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3130 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3251 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
3131 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3252 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
3132 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3253 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
3133 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3254 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
3134 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3255 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
3135
3136 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3137 coro_ready[i] = newAV ();
3138 3256
3139 { 3257 {
3140 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3258 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3141 3259
3142 coroapi.schedule = api_schedule; 3260 coroapi.schedule = api_schedule;
3183cede_notself (...) 3301cede_notself (...)
3184 CODE: 3302 CODE:
3185 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3303 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3186 3304
3187void 3305void
3188_cancel (Coro::State self)
3189 CODE:
3190 coro_state_destroy (aTHX_ self);
3191 coro_call_on_destroy (aTHX_ self);
3192
3193void
3194_set_current (SV *current) 3306_set_current (SV *current)
3195 PROTOTYPE: $ 3307 PROTOTYPE: $
3196 CODE: 3308 CODE:
3197 SvREFCNT_dec (SvRV (coro_current)); 3309 SvREFCNT_dec (SvRV (coro_current));
3198 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 3310 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3240 PROTOTYPE: 3352 PROTOTYPE:
3241 CODE: 3353 CODE:
3242 RETVAL = coro_nready; 3354 RETVAL = coro_nready;
3243 OUTPUT: 3355 OUTPUT:
3244 RETVAL 3356 RETVAL
3357
3358void
3359suspend (Coro::State self)
3360 PROTOTYPE: $
3361 CODE:
3362 self->flags |= CF_SUSPENDED;
3363
3364void
3365resume (Coro::State self)
3366 PROTOTYPE: $
3367 CODE:
3368 self->flags &= ~CF_SUSPENDED;
3245 3369
3246void 3370void
3247_pool_handler (...) 3371_pool_handler (...)
3248 CODE: 3372 CODE:
3249 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3373 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3304rouse_wait (...) 3428rouse_wait (...)
3305 PROTOTYPE: ;$ 3429 PROTOTYPE: ;$
3306 PPCODE: 3430 PPCODE:
3307 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3431 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3308 3432
3433void
3434on_enter (SV *block)
3435 ALIAS:
3436 on_leave = 1
3437 PROTOTYPE: &
3438 CODE:
3439{
3440 struct coro *coro = SvSTATE_current;
3441 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3442
3443 block = (SV *)coro_sv_2cv (aTHX_ block);
3444
3445 if (!*avp)
3446 *avp = newAV ();
3447
3448 av_push (*avp, SvREFCNT_inc (block));
3449
3450 if (!ix)
3451 on_enterleave_call (aTHX_ block);
3452
3453 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3454 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3455 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3456}
3457
3309 3458
3310MODULE = Coro::State PACKAGE = PerlIO::cede 3459MODULE = Coro::State PACKAGE = PerlIO::cede
3311 3460
3312BOOT: 3461BOOT:
3313 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3462 PerlIO_define_layer (aTHX_ &PerlIO_cede);
3323 GvSTASH (CvGV (cv)) 3472 GvSTASH (CvGV (cv))
3324 ); 3473 );
3325 OUTPUT: 3474 OUTPUT:
3326 RETVAL 3475 RETVAL
3327 3476
3328# helper for Coro::Channel 3477# helper for Coro::Channel and others
3329SV * 3478SV *
3330_alloc (int count) 3479_alloc (int count)
3331 CODE: 3480 CODE:
3332 RETVAL = coro_waitarray_new (aTHX_ count); 3481 RETVAL = coro_waitarray_new (aTHX_ count);
3333 OUTPUT: 3482 OUTPUT:
3391 for (i = 1; i <= wcount; ++i) 3540 for (i = 1; i <= wcount; ++i)
3392 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3541 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3393 } 3542 }
3394} 3543}
3395 3544
3545MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3546
3547void
3548_may_delete (SV *sem, int count, int extra_refs)
3549 PPCODE:
3550{
3551 AV *av = (AV *)SvRV (sem);
3552
3553 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3554 && AvFILLp (av) == 0 /* no waiters, just count */
3555 && SvIV (AvARRAY (av)[0]) == count)
3556 XSRETURN_YES;
3557
3558 XSRETURN_NO;
3559}
3560
3396MODULE = Coro::State PACKAGE = Coro::Signal 3561MODULE = Coro::State PACKAGE = Coro::Signal
3397 3562
3398SV * 3563SV *
3399new (SV *klass) 3564new (SV *klass)
3400 CODE: 3565 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines