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.329 by root, Tue Nov 25 20:48:41 2008 UTC vs.
Revision 1.351 by root, Sat Jun 20 08:58:25 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 assert (9 == sizeof (svf) / sizeof (*svf));
1018
1019 load_perl (aTHX_ current);
1020 }
1021
1022 {
1023 int i;
1024
1025 for (i = 0; i < sizeof (svf) / sizeof (*svf); ++i)
1026 SvREFCNT_dec (svf [i]);
1027
963 SvREFCNT_dec (coro->saved_deffh); 1028 SvREFCNT_dec (coro->saved_deffh);
964 SvREFCNT_dec (coro->rouse_cb); 1029 SvREFCNT_dec (coro->rouse_cb);
965 SvREFCNT_dec (coro->invoke_cb); 1030 SvREFCNT_dec (coro->invoke_cb);
966 SvREFCNT_dec (coro->invoke_av); 1031 SvREFCNT_dec (coro->invoke_av);
967 1032 }
968 coro_destruct_stacks (aTHX);
969} 1033}
970 1034
971INLINE void 1035INLINE void
972free_coro_mortal (pTHX) 1036free_coro_mortal (pTHX)
973{ 1037{
1267cctx_destroy (coro_cctx *cctx) 1331cctx_destroy (coro_cctx *cctx)
1268{ 1332{
1269 if (!cctx) 1333 if (!cctx)
1270 return; 1334 return;
1271 1335
1272 assert (cctx != cctx_current);//D temporary 1336 assert (("FATAL: tried to destroy current cctx", cctx != cctx_current));//D temporary?
1273 1337
1274 --cctx_count; 1338 --cctx_count;
1275 coro_destroy (&cctx->cctx); 1339 coro_destroy (&cctx->cctx);
1276 1340
1277 /* coro_transfer creates new, empty cctx's */ 1341 /* coro_transfer creates new, empty cctx's */
1341 /* TODO: throwing up here is considered harmful */ 1405 /* TODO: throwing up here is considered harmful */
1342 1406
1343 if (expect_true (prev != next)) 1407 if (expect_true (prev != next))
1344 { 1408 {
1345 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW)))) 1409 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
1346 croak ("Coro::State::transfer called with a suspended prev Coro::State, but can only transfer from running or new states,"); 1410 croak ("Coro::State::transfer called with a blocked prev Coro::State, but can only transfer from running or new states,");
1347 1411
1348 if (expect_false (next->flags & CF_RUNNING))
1349 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states,");
1350
1351 if (expect_false (next->flags & CF_DESTROYED)) 1412 if (expect_false (next->flags & (CF_RUNNING | CF_DESTROYED | CF_SUSPENDED)))
1352 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states,"); 1413 croak ("Coro::State::transfer called with running, destroyed or suspended next Coro::State, but can only transfer to inactive states,");
1353 1414
1354#if !PERL_VERSION_ATLEAST (5,10,0) 1415#if !PERL_VERSION_ATLEAST (5,10,0)
1355 if (expect_false (PL_lex_state != LEX_NOTPARSING)) 1416 if (expect_false (PL_lex_state != LEX_NOTPARSING))
1356 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,"); 1417 croak ("Coro::State::transfer called while parsing, but this is not supported in your perl version,");
1357#endif 1418#endif
1395 coro_setup (aTHX_ next); 1456 coro_setup (aTHX_ next);
1396 } 1457 }
1397 else 1458 else
1398 load_perl (aTHX_ next); 1459 load_perl (aTHX_ next);
1399 1460
1400 assert (!prev->cctx);//D temporary
1401
1402 /* possibly untie and reuse the cctx */ 1461 /* possibly untie and reuse the cctx */
1403 if (expect_true ( 1462 if (expect_true (
1404 cctx_current->idle_sp == STACKLEVEL 1463 cctx_current->idle_sp == STACKLEVEL
1405 && !(cctx_current->flags & CC_TRACE) 1464 && !(cctx_current->flags & CC_TRACE)
1406 && !force_cctx 1465 && !force_cctx
1447coro_state_destroy (pTHX_ struct coro *coro) 1506coro_state_destroy (pTHX_ struct coro *coro)
1448{ 1507{
1449 if (coro->flags & CF_DESTROYED) 1508 if (coro->flags & CF_DESTROYED)
1450 return 0; 1509 return 0;
1451 1510
1452 if (coro->on_destroy) 1511 if (coro->on_destroy && !PL_dirty)
1453 coro->on_destroy (aTHX_ coro); 1512 coro->on_destroy (aTHX_ coro);
1454 1513
1455 coro->flags |= CF_DESTROYED; 1514 coro->flags |= CF_DESTROYED;
1456 1515
1457 if (coro->flags & CF_READY) 1516 if (coro->flags & CF_READY)
1461 --coro_nready; 1520 --coro_nready;
1462 } 1521 }
1463 else 1522 else
1464 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1523 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1465 1524
1466 if (coro->mainstack && coro->mainstack != main_mainstack) 1525 if (coro->mainstack
1467 { 1526 && coro->mainstack != main_mainstack
1468 struct coro temp; 1527 && coro->slot
1469 1528 && !PL_dirty)
1470 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1471
1472 save_perl (aTHX_ &temp);
1473 load_perl (aTHX_ coro);
1474
1475 coro_destruct (aTHX_ coro); 1529 coro_destruct_perl (aTHX_ coro);
1476
1477 load_perl (aTHX_ &temp);
1478
1479 coro->slot = 0;
1480 }
1481 1530
1482 cctx_destroy (coro->cctx); 1531 cctx_destroy (coro->cctx);
1483 SvREFCNT_dec (coro->startcv); 1532 SvREFCNT_dec (coro->startcv);
1484 SvREFCNT_dec (coro->args); 1533 SvREFCNT_dec (coro->args);
1485 SvREFCNT_dec (CORO_THROW); 1534 SvREFCNT_dec (CORO_THROW);
1572/** Coro ********************************************************************/ 1621/** Coro ********************************************************************/
1573 1622
1574INLINE void 1623INLINE void
1575coro_enq (pTHX_ struct coro *coro) 1624coro_enq (pTHX_ struct coro *coro)
1576{ 1625{
1577 av_push (coro_ready [coro->prio - PRIO_MIN], SvREFCNT_inc_NN (coro->hv)); 1626 struct coro **ready = coro_ready [coro->prio - PRIO_MIN];
1578}
1579 1627
1580INLINE SV * 1628 SvREFCNT_inc_NN (coro->hv);
1629
1630 coro->next_ready = 0;
1631 *(ready [0] ? &ready [1]->next_ready : &ready [0]) = coro;
1632 ready [1] = coro;
1633}
1634
1635INLINE struct coro *
1581coro_deq (pTHX) 1636coro_deq (pTHX)
1582{ 1637{
1583 int prio; 1638 int prio;
1584 1639
1585 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; ) 1640 for (prio = PRIO_MAX - PRIO_MIN + 1; --prio >= 0; )
1586 if (AvFILLp (coro_ready [prio]) >= 0) 1641 {
1587 return av_shift (coro_ready [prio]); 1642 struct coro **ready = coro_ready [prio];
1643
1644 if (ready [0])
1645 {
1646 struct coro *coro = ready [0];
1647 ready [0] = coro->next_ready;
1648 return coro;
1649 }
1650 }
1588 1651
1589 return 0; 1652 return 0;
1590} 1653}
1591 1654
1592static int 1655static int
1656static void 1719static void
1657prepare_schedule (pTHX_ struct coro_transfer_args *ta) 1720prepare_schedule (pTHX_ struct coro_transfer_args *ta)
1658{ 1721{
1659 for (;;) 1722 for (;;)
1660 { 1723 {
1661 SV *next_sv = coro_deq (aTHX); 1724 struct coro *next = coro_deq (aTHX);
1662 1725
1663 if (expect_true (next_sv)) 1726 if (expect_true (next))
1664 { 1727 {
1665 struct coro *next = SvSTATE_hv (next_sv);
1666
1667 /* cannot transfer to destroyed coros, skip and look for next */ 1728 /* cannot transfer to destroyed coros, skip and look for next */
1668 if (expect_false (next->flags & CF_DESTROYED)) 1729 if (expect_false (next->flags & (CF_DESTROYED | CF_SUSPENDED)))
1669 SvREFCNT_dec (next_sv); /* coro_nready has already been taken care of by destroy */ 1730 SvREFCNT_dec (next->hv); /* coro_nready has already been taken care of by destroy */
1670 else 1731 else
1671 { 1732 {
1672 next->flags &= ~CF_READY; 1733 next->flags &= ~CF_READY;
1673 --coro_nready; 1734 --coro_nready;
1674 1735
1852 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */ 1913 av_push (av_destroy, (SV *)newRV_inc ((SV *)hv)); /* RVinc for perl */
1853 api_ready (aTHX_ sv_manager); 1914 api_ready (aTHX_ sv_manager);
1854 1915
1855 frame->prepare = prepare_schedule; 1916 frame->prepare = prepare_schedule;
1856 frame->check = slf_check_repeat; 1917 frame->check = slf_check_repeat;
1918
1919 /* as a minor optimisation, we could unwind all stacks here */
1920 /* but that puts extra pressure on pp_slf, and is not worth much */
1921 /*coro_unwind_stacks (aTHX);*/
1857} 1922}
1858 1923
1859/*****************************************************************************/ 1924/*****************************************************************************/
1860/* async pool handler */ 1925/* async pool handler */
1861 1926
1944 SV *data = (SV *)GENSUB_ARG; 2009 SV *data = (SV *)GENSUB_ARG;
1945 2010
1946 if (SvTYPE (SvRV (data)) != SVt_PVAV) 2011 if (SvTYPE (SvRV (data)) != SVt_PVAV)
1947 { 2012 {
1948 /* first call, set args */ 2013 /* first call, set args */
2014 SV *coro = SvRV (data);
1949 AV *av = newAV (); 2015 AV *av = newAV ();
1950 SV *coro = SvRV (data);
1951 2016
1952 SvRV_set (data, (SV *)av); 2017 SvRV_set (data, (SV *)av);
1953 api_ready (aTHX_ coro);
1954 SvREFCNT_dec (coro);
1955 2018
1956 /* better take a full copy of the arguments */ 2019 /* better take a full copy of the arguments */
1957 while (items--) 2020 while (items--)
1958 av_store (av, items, newSVsv (ST (items))); 2021 av_store (av, items, newSVsv (ST (items)));
2022
2023 api_ready (aTHX_ coro);
2024 SvREFCNT_dec (coro);
1959 } 2025 }
1960 2026
1961 XSRETURN_EMPTY; 2027 XSRETURN_EMPTY;
1962} 2028}
1963 2029
1980 2046
1981 EXTEND (SP, AvFILLp (av) + 1); 2047 EXTEND (SP, AvFILLp (av) + 1);
1982 for (i = 0; i <= AvFILLp (av); ++i) 2048 for (i = 0; i <= AvFILLp (av); ++i)
1983 PUSHs (sv_2mortal (AvARRAY (av)[i])); 2049 PUSHs (sv_2mortal (AvARRAY (av)[i]));
1984 2050
1985 /* we have stolen the elements, so ste length to zero and free */ 2051 /* we have stolen the elements, so set length to zero and free */
1986 AvFILLp (av) = -1; 2052 AvFILLp (av) = -1;
1987 av_undef (av); 2053 av_undef (av);
1988 2054
1989 PUTBACK; 2055 PUTBACK;
1990 } 2056 }
2280 2346
2281 PL_op->op_ppaddr = pp_slf; 2347 PL_op->op_ppaddr = pp_slf;
2282 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */ 2348 /*PL_op->op_type = OP_CUSTOM; /* we do behave like entersub still */
2283 2349
2284 PL_op = (OP *)&slf_restore; 2350 PL_op = (OP *)&slf_restore;
2351}
2352
2353/*****************************************************************************/
2354/* dynamic wind */
2355
2356static void
2357on_enterleave_call (pTHX_ SV *cb)
2358{
2359 dSP;
2360
2361 PUSHSTACK;
2362
2363 PUSHMARK (SP);
2364 PUTBACK;
2365 call_sv (cb, G_VOID | G_DISCARD);
2366 SPAGAIN;
2367
2368 POPSTACK;
2369}
2370
2371static SV *
2372coro_avp_pop_and_free (pTHX_ AV **avp)
2373{
2374 AV *av = *avp;
2375 SV *res = av_pop (av);
2376
2377 if (AvFILLp (av) < 0)
2378 {
2379 *avp = 0;
2380 SvREFCNT_dec (av);
2381 }
2382
2383 return res;
2384}
2385
2386static void
2387coro_pop_on_enter (pTHX_ void *coro)
2388{
2389 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_enter);
2390 SvREFCNT_dec (cb);
2391}
2392
2393static void
2394coro_pop_on_leave (pTHX_ void *coro)
2395{
2396 SV *cb = coro_avp_pop_and_free (aTHX_ &((struct coro *)coro)->on_leave);
2397 on_enterleave_call (aTHX_ sv_2mortal (cb));
2285} 2398}
2286 2399
2287/*****************************************************************************/ 2400/*****************************************************************************/
2288/* PerlIO::cede */ 2401/* PerlIO::cede */
2289 2402
2915SV * 3028SV *
2916clone (Coro::State coro) 3029clone (Coro::State coro)
2917 CODE: 3030 CODE:
2918{ 3031{
2919#if CORO_CLONE 3032#if CORO_CLONE
2920 struct coro *ncoro = coro_clone (coro); 3033 struct coro *ncoro = coro_clone (aTHX_ coro);
2921 MAGIC *mg; 3034 MAGIC *mg;
2922 /* TODO: too much duplication */ 3035 /* TODO: too much duplication */
2923 ncoro->hv = newHV (); 3036 ncoro->hv = newHV ();
2924 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 3037 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2925 mg->mg_flags |= MGf_DUP; 3038 mg->mg_flags |= MGf_DUP;
2987 eval = 1 3100 eval = 1
2988 CODE: 3101 CODE:
2989{ 3102{
2990 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot)) 3103 if (coro->mainstack && ((coro->flags & CF_RUNNING) || coro->slot))
2991 { 3104 {
2992 struct coro temp; 3105 struct coro *current = SvSTATE_current;
2993 3106
2994 if (!(coro->flags & CF_RUNNING)) 3107 if (current != coro)
2995 { 3108 {
2996 PUTBACK; 3109 PUTBACK;
2997 save_perl (aTHX_ &temp); 3110 save_perl (aTHX_ current);
2998 load_perl (aTHX_ coro); 3111 load_perl (aTHX_ coro);
3112 SPAGAIN;
2999 } 3113 }
3000 3114
3001 {
3002 dSP;
3003 ENTER;
3004 SAVETMPS;
3005 PUTBACK;
3006 PUSHSTACK; 3115 PUSHSTACK;
3116
3007 PUSHMARK (SP); 3117 PUSHMARK (SP);
3118 PUTBACK;
3008 3119
3009 if (ix) 3120 if (ix)
3010 eval_sv (coderef, 0); 3121 eval_sv (coderef, 0);
3011 else 3122 else
3012 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD); 3123 call_sv (coderef, G_KEEPERR | G_EVAL | G_VOID | G_DISCARD);
3013 3124
3014 POPSTACK; 3125 POPSTACK;
3015 SPAGAIN; 3126 SPAGAIN;
3016 FREETMPS;
3017 LEAVE;
3018 PUTBACK;
3019 }
3020 3127
3021 if (!(coro->flags & CF_RUNNING)) 3128 if (current != coro)
3022 { 3129 {
3130 PUTBACK;
3023 save_perl (aTHX_ coro); 3131 save_perl (aTHX_ coro);
3024 load_perl (aTHX_ &temp); 3132 load_perl (aTHX_ current);
3025 SPAGAIN; 3133 SPAGAIN;
3026 } 3134 }
3027 } 3135 }
3028} 3136}
3029 3137
3033 ALIAS: 3141 ALIAS:
3034 is_ready = CF_READY 3142 is_ready = CF_READY
3035 is_running = CF_RUNNING 3143 is_running = CF_RUNNING
3036 is_new = CF_NEW 3144 is_new = CF_NEW
3037 is_destroyed = CF_DESTROYED 3145 is_destroyed = CF_DESTROYED
3146 is_suspended = CF_SUSPENDED
3038 CODE: 3147 CODE:
3039 RETVAL = boolSV (coro->flags & ix); 3148 RETVAL = boolSV (coro->flags & ix);
3040 OUTPUT: 3149 OUTPUT:
3041 RETVAL 3150 RETVAL
3042 3151
3107 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv; 3216 SV **dst = ix ? (SV **)&self->slot->defav : (SV **)&self->slot->defsv;
3108 3217
3109 SV *tmp = *src; *src = *dst; *dst = tmp; 3218 SV *tmp = *src; *src = *dst; *dst = tmp;
3110 } 3219 }
3111 3220
3221void
3222cancel (Coro::State self)
3223 CODE:
3224 coro_state_destroy (aTHX_ self);
3225 coro_call_on_destroy (aTHX_ self); /* actually only for Coro objects */
3226
3112 3227
3113MODULE = Coro::State PACKAGE = Coro 3228MODULE = Coro::State PACKAGE = Coro
3114 3229
3115BOOT: 3230BOOT:
3116{ 3231{
3117 int i;
3118
3119 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE); 3232 sv_pool_rss = coro_get_sv (aTHX_ "Coro::POOL_RSS" , TRUE);
3120 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE); 3233 sv_pool_size = coro_get_sv (aTHX_ "Coro::POOL_SIZE" , TRUE);
3121 cv_coro_run = get_cv ( "Coro::_terminate", GV_ADD); 3234 cv_coro_run = get_cv ( "Coro::_coro_run" , GV_ADD);
3122 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD); 3235 cv_coro_terminate = get_cv ( "Coro::terminate" , GV_ADD);
3123 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current); 3236 coro_current = coro_get_sv (aTHX_ "Coro::current" , FALSE); SvREADONLY_on (coro_current);
3124 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE); 3237 av_async_pool = coro_get_av (aTHX_ "Coro::async_pool", TRUE);
3125 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE); 3238 av_destroy = coro_get_av (aTHX_ "Coro::destroy" , TRUE);
3126 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE); 3239 sv_manager = coro_get_sv (aTHX_ "Coro::manager" , TRUE);
3137 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH)); 3250 newCONSTSUB (coro_stash, "PRIO_HIGH", newSViv (PRIO_HIGH));
3138 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL)); 3251 newCONSTSUB (coro_stash, "PRIO_NORMAL", newSViv (PRIO_NORMAL));
3139 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW)); 3252 newCONSTSUB (coro_stash, "PRIO_LOW", newSViv (PRIO_LOW));
3140 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE)); 3253 newCONSTSUB (coro_stash, "PRIO_IDLE", newSViv (PRIO_IDLE));
3141 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN)); 3254 newCONSTSUB (coro_stash, "PRIO_MIN", newSViv (PRIO_MIN));
3142
3143 for (i = PRIO_MAX - PRIO_MIN + 1; i--; )
3144 coro_ready[i] = newAV ();
3145 3255
3146 { 3256 {
3147 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE); 3257 SV *sv = coro_get_sv (aTHX_ "Coro::API", TRUE);
3148 3258
3149 coroapi.schedule = api_schedule; 3259 coroapi.schedule = api_schedule;
3190cede_notself (...) 3300cede_notself (...)
3191 CODE: 3301 CODE:
3192 CORO_EXECUTE_SLF_XS (slf_init_cede_notself); 3302 CORO_EXECUTE_SLF_XS (slf_init_cede_notself);
3193 3303
3194void 3304void
3195_cancel (Coro::State self)
3196 CODE:
3197 coro_state_destroy (aTHX_ self);
3198 coro_call_on_destroy (aTHX_ self);
3199
3200void
3201_set_current (SV *current) 3305_set_current (SV *current)
3202 PROTOTYPE: $ 3306 PROTOTYPE: $
3203 CODE: 3307 CODE:
3204 SvREFCNT_dec (SvRV (coro_current)); 3308 SvREFCNT_dec (SvRV (coro_current));
3205 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current))); 3309 SvRV_set (coro_current, SvREFCNT_inc_NN (SvRV (current)));
3247 PROTOTYPE: 3351 PROTOTYPE:
3248 CODE: 3352 CODE:
3249 RETVAL = coro_nready; 3353 RETVAL = coro_nready;
3250 OUTPUT: 3354 OUTPUT:
3251 RETVAL 3355 RETVAL
3356
3357void
3358suspend (Coro::State self)
3359 PROTOTYPE: $
3360 CODE:
3361 self->flags |= CF_SUSPENDED;
3362
3363void
3364resume (Coro::State self)
3365 PROTOTYPE: $
3366 CODE:
3367 self->flags &= ~CF_SUSPENDED;
3252 3368
3253void 3369void
3254_pool_handler (...) 3370_pool_handler (...)
3255 CODE: 3371 CODE:
3256 CORO_EXECUTE_SLF_XS (slf_init_pool_handler); 3372 CORO_EXECUTE_SLF_XS (slf_init_pool_handler);
3311rouse_wait (...) 3427rouse_wait (...)
3312 PROTOTYPE: ;$ 3428 PROTOTYPE: ;$
3313 PPCODE: 3429 PPCODE:
3314 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait); 3430 CORO_EXECUTE_SLF_XS (slf_init_rouse_wait);
3315 3431
3432void
3433on_enter (SV *block)
3434 ALIAS:
3435 on_leave = 1
3436 PROTOTYPE: &
3437 CODE:
3438{
3439 struct coro *coro = SvSTATE_current;
3440 AV **avp = ix ? &coro->on_leave : &coro->on_enter;
3441
3442 block = (SV *)coro_sv_2cv (aTHX_ block);
3443
3444 if (!*avp)
3445 *avp = newAV ();
3446
3447 av_push (*avp, SvREFCNT_inc (block));
3448
3449 if (!ix)
3450 on_enterleave_call (aTHX_ block);
3451
3452 LEAVE; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3453 SAVEDESTRUCTOR_X (ix ? coro_pop_on_leave : coro_pop_on_enter, (void *)coro);
3454 ENTER; /* pp_entersub unfortunately forces an ENTER/LEAVE around XS calls */
3455}
3456
3316 3457
3317MODULE = Coro::State PACKAGE = PerlIO::cede 3458MODULE = Coro::State PACKAGE = PerlIO::cede
3318 3459
3319BOOT: 3460BOOT:
3320 PerlIO_define_layer (aTHX_ &PerlIO_cede); 3461 PerlIO_define_layer (aTHX_ &PerlIO_cede);
3330 GvSTASH (CvGV (cv)) 3471 GvSTASH (CvGV (cv))
3331 ); 3472 );
3332 OUTPUT: 3473 OUTPUT:
3333 RETVAL 3474 RETVAL
3334 3475
3335# helper for Coro::Channel 3476# helper for Coro::Channel and others
3336SV * 3477SV *
3337_alloc (int count) 3478_alloc (int count)
3338 CODE: 3479 CODE:
3339 RETVAL = coro_waitarray_new (aTHX_ count); 3480 RETVAL = coro_waitarray_new (aTHX_ count);
3340 OUTPUT: 3481 OUTPUT:
3398 for (i = 1; i <= wcount; ++i) 3539 for (i = 1; i <= wcount; ++i)
3399 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i]))); 3540 PUSHs (sv_2mortal (newRV_inc (AvARRAY (av)[i])));
3400 } 3541 }
3401} 3542}
3402 3543
3544MODULE = Coro::State PACKAGE = Coro::SemaphoreSet
3545
3546void
3547_may_delete (SV *sem, int count, int extra_refs)
3548 PPCODE:
3549{
3550 AV *av = (AV *)SvRV (sem);
3551
3552 if (SvREFCNT ((SV *)av) == 1 + extra_refs
3553 && AvFILLp (av) == 0 /* no waiters, just count */
3554 && SvIV (AvARRAY (av)[0]) == count)
3555 XSRETURN_YES;
3556
3557 XSRETURN_NO;
3558}
3559
3403MODULE = Coro::State PACKAGE = Coro::Signal 3560MODULE = Coro::State PACKAGE = Coro::Signal
3404 3561
3405SV * 3562SV *
3406new (SV *klass) 3563new (SV *klass)
3407 CODE: 3564 CODE:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines