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.190 by root, Fri Oct 5 20:39:39 2007 UTC vs.
Revision 1.194 by root, Sat Oct 6 00:08:04 2007 UTC

… …
79 79
80/* 5.8.8 */ 80/* 5.8.8 */
81#ifndef GV_NOTQUAL 81#ifndef GV_NOTQUAL
82# define GV_NOTQUAL 0 82# define GV_NOTQUAL 0
83#endif 83#endif
84#ifndef newSV
85# define newSV(l) NEWSV(0,l)
86#endif
84 87
85#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64 88#if !__i386 && !__x86_64 && !__powerpc && !__m68k && !__alpha && !__mips && !__sparc64
86# undef CORO_STACKGUARD 89# undef CORO_STACKGUARD
87#endif 90#endif
88 91
… …
103#define IN_DESTRUCT (PL_main_cv == Nullcv) 106#define IN_DESTRUCT (PL_main_cv == Nullcv)
104 107
105#if __GNUC__ >= 3 108#if __GNUC__ >= 3
106# define attribute(x) __attribute__(x) 109# define attribute(x) __attribute__(x)
107# define BARRIER __asm__ __volatile__ ("" : : : "memory") 110# define BARRIER __asm__ __volatile__ ("" : : : "memory")
111# define expect(expr,value) __builtin_expect ((expr),(value))
108#else 112#else
109# define attribute(x) 113# define attribute(x)
110# define BARRIER 114# define BARRIER
115# define expect(expr,value) (expr)
111#endif 116#endif
117
118#define expect_false(expr) expect ((expr) != 0, 0)
119#define expect_true(expr) expect ((expr) != 0, 1)
112 120
113#define NOINLINE attribute ((noinline)) 121#define NOINLINE attribute ((noinline))
114 122
115#include "CoroAPI.h" 123#include "CoroAPI.h"
116 124
… …
322 MAGIC *mg; 330 MAGIC *mg;
323 331
324 if (SvROK (coro)) 332 if (SvROK (coro))
325 coro = SvRV (coro); 333 coro = SvRV (coro);
326 334
327 if (SvTYPE (coro) != SVt_PVHV) 335 if (expect_false (SvTYPE (coro) != SVt_PVHV))
328 croak ("Coro::State object required"); 336 croak ("Coro::State object required");
329 337
330 stash = SvSTASH (coro); 338 stash = SvSTASH (coro);
331 if (stash != coro_stash && stash != coro_state_stash) 339 if (expect_false (stash != coro_stash && stash != coro_state_stash))
332 { 340 {
333 /* very slow, but rare, check */ 341 /* very slow, but rare, check */
334 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State")) 342 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
335 croak ("Coro::State object required"); 343 croak ("Coro::State object required");
336 } 344 }
… …
346get_padlist (pTHX_ CV *cv) 354get_padlist (pTHX_ CV *cv)
347{ 355{
348 MAGIC *mg = CORO_MAGIC (cv); 356 MAGIC *mg = CORO_MAGIC (cv);
349 AV *av; 357 AV *av;
350 358
351 if (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0) 359 if (expect_true (mg && AvFILLp ((av = (AV *)mg->mg_obj)) >= 0))
352 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--]; 360 CvPADLIST (cv) = (AV *)AvARRAY (av)[AvFILLp (av)--];
353 else 361 else
354 { 362 {
355#if CORO_PREFER_PERL_FUNCTIONS 363#if CORO_PREFER_PERL_FUNCTIONS
356 /* this is probably cleaner, but also slower? */ 364 /* this is probably cleaner, but also slower? */
… …
368put_padlist (pTHX_ CV *cv) 376put_padlist (pTHX_ CV *cv)
369{ 377{
370 MAGIC *mg = CORO_MAGIC (cv); 378 MAGIC *mg = CORO_MAGIC (cv);
371 AV *av; 379 AV *av;
372 380
373 if (!mg) 381 if (expect_false (!mg))
374 { 382 {
375 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0); 383 sv_magic ((SV *)cv, 0, PERL_MAGIC_coro, 0, 0);
376 mg = mg_find ((SV *)cv, PERL_MAGIC_coro); 384 mg = mg_find ((SV *)cv, PERL_MAGIC_coro);
377 mg->mg_virtual = &vtbl_coro; 385 mg->mg_virtual = &vtbl_coro;
378 mg->mg_obj = (SV *)newAV (); 386 mg->mg_obj = (SV *)newAV ();
379 } 387 }
380 388
381 av = (AV *)mg->mg_obj; 389 av = (AV *)mg->mg_obj;
382 390
383 if (AvFILLp (av) >= AvMAX (av)) 391 if (expect_false (AvFILLp (av) >= AvMAX (av)))
384 av_extend (av, AvMAX (av) + 1); 392 av_extend (av, AvMAX (av) + 1);
385 393
386 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv); 394 AvARRAY (av)[++AvFILLp (av)] = (SV *)CvPADLIST (cv);
387} 395}
388 396
… …
403 { 411 {
404 dSP; 412 dSP;
405 CV *cv; 413 CV *cv;
406 414
407 /* now do the ugly restore mess */ 415 /* now do the ugly restore mess */
408 while ((cv = (CV *)POPs)) 416 while (expect_true (cv = (CV *)POPs))
409 { 417 {
410 put_padlist (aTHX_ cv); /* mark this padlist as available */ 418 put_padlist (aTHX_ cv); /* mark this padlist as available */
411 CvDEPTH (cv) = PTR2IV (POPs); 419 CvDEPTH (cv) = PTR2IV (POPs);
412 CvPADLIST (cv) = (AV *)POPs; 420 CvPADLIST (cv) = (AV *)POPs;
413 } 421 }
… …
432 440
433 XPUSHs (Nullsv); 441 XPUSHs (Nullsv);
434 /* this loop was inspired by pp_caller */ 442 /* this loop was inspired by pp_caller */
435 for (;;) 443 for (;;)
436 { 444 {
437 while (cxix >= 0) 445 while (expect_true (cxix >= 0))
438 { 446 {
439 PERL_CONTEXT *cx = &ccstk[cxix--]; 447 PERL_CONTEXT *cx = &ccstk[cxix--];
440 448
441 if (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT) 449 if (expect_true (CxTYPE (cx) == CXt_SUB || CxTYPE (cx) == CXt_FORMAT))
442 { 450 {
443 CV *cv = cx->blk_sub.cv; 451 CV *cv = cx->blk_sub.cv;
444 452
445 if (CvDEPTH (cv)) 453 if (expect_true (CvDEPTH (cv)))
446 { 454 {
447 EXTEND (SP, 3); 455 EXTEND (SP, 3);
448 PUSHs ((SV *)CvPADLIST (cv)); 456 PUSHs ((SV *)CvPADLIST (cv));
449 PUSHs (INT2PTR (SV *, CvDEPTH (cv))); 457 PUSHs (INT2PTR (SV *, CvDEPTH (cv)));
450 PUSHs ((SV *)cv); 458 PUSHs ((SV *)cv);
… …
453 get_padlist (aTHX_ cv); 461 get_padlist (aTHX_ cv);
454 } 462 }
455 } 463 }
456 } 464 }
457 465
458 if (top_si->si_type == PERLSI_MAIN) 466 if (expect_true (top_si->si_type == PERLSI_MAIN))
459 break; 467 break;
460 468
461 top_si = top_si->si_prev; 469 top_si = top_si->si_prev;
462 ccstk = top_si->si_cxstack; 470 ccstk = top_si->si_cxstack;
463 cxix = top_si->si_cxix; 471 cxix = top_si->si_cxix;
… …
604 PL_curpm = 0; 612 PL_curpm = 0;
605 PL_localizing = 0; 613 PL_localizing = 0;
606 PL_dirty = 0; 614 PL_dirty = 0;
607 PL_restartop = 0; 615 PL_restartop = 0;
608 616
609 GvSV (PL_defgv) = NEWSV (0, 0); 617 GvSV (PL_defgv) = newSV (0);
610 GvAV (PL_defgv) = coro->args; coro->args = 0; 618 GvAV (PL_defgv) = coro->args; coro->args = 0;
611 GvSV (PL_errgv) = NEWSV (0, 0); 619 GvSV (PL_errgv) = newSV (0);
612 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0); 620 GvSV (irsgv) = newSVpvn ("\n", 1); sv_magic (GvSV (irsgv), (SV *)irsgv, PERL_MAGIC_sv, "/", 0);
613 PL_rs = newSVsv (GvSV (irsgv)); 621 PL_rs = newSVsv (GvSV (irsgv));
614 PL_defoutgv = SvREFCNT_inc (stdoutgv); 622 PL_defoutgv = SvREFCNT_inc (stdoutgv);
615 623
624 ENTER; /* necessary e.g. for dounwind */
625
616 { 626 {
617 dSP; 627 dSP;
618 LOGOP myop; 628 LOGOP myop;
619 629
620 Zero (&myop, 1, LOGOP); 630 Zero (&myop, 1, LOGOP);
621 myop.op_next = Nullop; 631 myop.op_next = Nullop;
622 myop.op_flags = OPf_WANT_VOID; 632 myop.op_flags = OPf_WANT_VOID;
623 633
624 PUSHMARK (SP); 634 PUSHMARK (SP);
625 XPUSHs (av_shift (GvAV (PL_defgv))); 635 XPUSHs (sv_2mortal (av_shift (GvAV (PL_defgv))));
626 PUTBACK; 636 PUTBACK;
627 PL_op = (OP *)&myop; 637 PL_op = (OP *)&myop;
628 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX); 638 PL_op = PL_ppaddr[OP_ENTERSUB](aTHX);
629 SPAGAIN; 639 SPAGAIN;
630 } 640 }
631
632 ENTER; /* necessary e.g. for dounwind */
633} 641}
634 642
635static void 643static void
636coro_destroy (pTHX_ struct coro *coro) 644coro_destroy (pTHX_ struct coro *coro)
637{ 645{
… …
666} 674}
667 675
668static void 676static void
669free_coro_mortal (pTHX) 677free_coro_mortal (pTHX)
670{ 678{
671 if (coro_mortal) 679 if (expect_true (coro_mortal))
672 { 680 {
673 SvREFCNT_dec (coro_mortal); 681 SvREFCNT_dec (coro_mortal);
674 coro_mortal = 0; 682 coro_mortal = 0;
675 } 683 }
676} 684}
… …
705 bot = PL_stack_base + cx->blk_oldsp + 1; 713 bot = PL_stack_base + cx->blk_oldsp + 1;
706 top = cx->blk_gimme == G_ARRAY ? SP + 1 714 top = cx->blk_gimme == G_ARRAY ? SP + 1
707 : cx->blk_gimme == G_SCALAR ? bot + 1 715 : cx->blk_gimme == G_SCALAR ? bot + 1
708 : bot; 716 : bot;
709 717
718 av_extend (av, top - bot);
710 while (bot < top) 719 while (bot < top)
711 av_push (av, SvREFCNT_inc (*bot++)); 720 av_push (av, SvREFCNT_inc (*bot++));
712 721
713 PL_runops = RUNOPS_DEFAULT; 722 PL_runops = RUNOPS_DEFAULT;
714 ENTER; 723 ENTER;
… …
926 Safefree (cctx->sptr); 935 Safefree (cctx->sptr);
927 936
928 Safefree (cctx); 937 Safefree (cctx);
929} 938}
930 939
940/* wether this cctx should be destructed */
941#define CCTX_EXPIRED(cctx) ((cctx)->ssize < coro_stacksize || ((cctx)->flags & CC_NOREUSE))
942
931static coro_cctx * 943static coro_cctx *
932cctx_get (pTHX) 944cctx_get (pTHX)
933{ 945{
934 while (cctx_first) 946 while (expect_true (cctx_first))
935 { 947 {
936 coro_cctx *cctx = cctx_first; 948 coro_cctx *cctx = cctx_first;
937 cctx_first = cctx->next; 949 cctx_first = cctx->next;
938 --cctx_idle; 950 --cctx_idle;
939 951
940 if (cctx->ssize >= coro_stacksize && !(cctx->flags & CC_NOREUSE)) 952 if (expect_true (!CCTX_EXPIRED (cctx)))
941 return cctx; 953 return cctx;
942 954
943 cctx_destroy (cctx); 955 cctx_destroy (cctx);
944 } 956 }
945 957
… …
948 960
949static void 961static void
950cctx_put (coro_cctx *cctx) 962cctx_put (coro_cctx *cctx)
951{ 963{
952 /* free another cctx if overlimit */ 964 /* free another cctx if overlimit */
953 if (cctx_idle >= MAX_IDLE_CCTX) 965 if (expect_false (cctx_idle >= MAX_IDLE_CCTX))
954 { 966 {
955 coro_cctx *first = cctx_first; 967 coro_cctx *first = cctx_first;
956 cctx_first = first->next; 968 cctx_first = first->next;
957 --cctx_idle; 969 --cctx_idle;
958 970
… …
964 cctx_first = cctx; 976 cctx_first = cctx;
965} 977}
966 978
967/** coroutine switching *****************************************************/ 979/** coroutine switching *****************************************************/
968 980
969static void NOINLINE 981static void
970transfer_check (pTHX_ struct coro *prev, struct coro *next) 982transfer_check (pTHX_ struct coro *prev, struct coro *next)
971{ 983{
972 if (prev != next) 984 if (expect_true (prev != next))
973 { 985 {
974 if (!(prev->flags & (CF_RUNNING | CF_NEW))) 986 if (expect_false (!(prev->flags & (CF_RUNNING | CF_NEW))))
975 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states"); 987 croak ("Coro::State::transfer called with non-running/new prev Coro::State, but can only transfer from running or new states");
976 988
977 if (next->flags & CF_RUNNING) 989 if (expect_false (next->flags & CF_RUNNING))
978 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states"); 990 croak ("Coro::State::transfer called with running next Coro::State, but can only transfer to inactive states");
979 991
980 if (next->flags & CF_DESTROYED) 992 if (expect_false (next->flags & CF_DESTROYED))
981 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states"); 993 croak ("Coro::State::transfer called with destroyed next Coro::State, but can only transfer to inactive states");
982 994
983 if (PL_lex_state != LEX_NOTPARSING) 995 if (expect_false (PL_lex_state != LEX_NOTPARSING))
984 croak ("Coro::State::transfer called while parsing, but this is not supported"); 996 croak ("Coro::State::transfer called while parsing, but this is not supported");
985 } 997 }
986} 998}
987 999
988/* always use the TRANSFER macro */ 1000/* always use the TRANSFER macro */
… …
990transfer (pTHX_ struct coro *prev, struct coro *next) 1002transfer (pTHX_ struct coro *prev, struct coro *next)
991{ 1003{
992 dSTACKLEVEL; 1004 dSTACKLEVEL;
993 1005
994 /* sometimes transfer is only called to set idle_sp */ 1006 /* sometimes transfer is only called to set idle_sp */
995 if (!next) 1007 if (expect_false (!next))
996 { 1008 {
997 ((coro_cctx *)prev)->idle_sp = STACKLEVEL; 1009 ((coro_cctx *)prev)->idle_sp = STACKLEVEL;
998 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */ 1010 assert (((coro_cctx *)prev)->idle_te = PL_top_env); /* just for the side-effect when asserts are enabled */
999 } 1011 }
1000 else if (prev != next) 1012 else if (expect_true (prev != next))
1001 { 1013 {
1002 coro_cctx *prev__cctx; 1014 coro_cctx *prev__cctx;
1003 1015
1004 if (prev->flags & CF_NEW) 1016 if (expect_false (prev->flags & CF_NEW))
1005 { 1017 {
1006 /* create a new empty context */ 1018 /* create a new empty context */
1007 Newz (0, prev->cctx, 1, coro_cctx); 1019 Newz (0, prev->cctx, 1, coro_cctx);
1008 prev->flags &= ~CF_NEW; 1020 prev->flags &= ~CF_NEW;
1009 prev->flags |= CF_RUNNING; 1021 prev->flags |= CF_RUNNING;
… …
1012 prev->flags &= ~CF_RUNNING; 1024 prev->flags &= ~CF_RUNNING;
1013 next->flags |= CF_RUNNING; 1025 next->flags |= CF_RUNNING;
1014 1026
1015 LOCK; 1027 LOCK;
1016 1028
1017 if (next->flags & CF_NEW) 1029 if (expect_false (next->flags & CF_NEW))
1018 { 1030 {
1019 /* need to start coroutine */ 1031 /* need to start coroutine */
1020 next->flags &= ~CF_NEW; 1032 next->flags &= ~CF_NEW;
1021 /* first get rid of the old state */ 1033 /* first get rid of the old state */
1022 save_perl (aTHX_ prev); 1034 save_perl (aTHX_ prev);
… …
1031 } 1043 }
1032 1044
1033 prev__cctx = prev->cctx; 1045 prev__cctx = prev->cctx;
1034 1046
1035 /* possibly "free" the cctx */ 1047 /* possibly "free" the cctx */
1036 if (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)) 1048 if (expect_true (prev__cctx->idle_sp == STACKLEVEL && !(prev__cctx->flags & CC_TRACE)))
1037 { 1049 {
1038 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */ 1050 /* I assume that STACKLEVEL is a stronger indicator than PL_top_env changes */
1039 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te)); 1051 assert (("ERROR: current top_env must equal previous top_env", PL_top_env == prev__cctx->idle_te));
1040 1052
1041 prev->cctx = 0; 1053 prev->cctx = 0;
1042 1054
1055 /* if the cctx is about to be destroyed we need to make sure we won't see it in cctx_get */
1056 /* without this the next cctx_get might destroy the prev__cctx while still in use */
1057 if (expect_false (CCTX_EXPIRED (prev__cctx)))
1058 next->cctx = cctx_get (aTHX);
1059
1043 cctx_put (prev__cctx); 1060 cctx_put (prev__cctx);
1044 } 1061 }
1045 1062
1046 ++next->usecount; 1063 ++next->usecount;
1047 1064
1048 if (!next->cctx) 1065 if (expect_true (!next->cctx))
1049 next->cctx = cctx_get (aTHX); 1066 next->cctx = cctx_get (aTHX);
1050 1067
1051 if (prev__cctx != next->cctx) 1068 if (expect_false (prev__cctx != next->cctx))
1052 { 1069 {
1053 prev__cctx->top_env = PL_top_env; 1070 prev__cctx->top_env = PL_top_env;
1054 PL_top_env = next->cctx->top_env; 1071 PL_top_env = next->cctx->top_env;
1055 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx); 1072 coro_transfer (&prev__cctx->cctx, &next->cctx->cctx);
1056 } 1073 }
… …
1236 { 1253 {
1237 LOCK; 1254 LOCK;
1238 next_sv = coro_deq (aTHX_ PRIO_MIN); 1255 next_sv = coro_deq (aTHX_ PRIO_MIN);
1239 1256
1240 /* nothing to schedule: call the idle handler */ 1257 /* nothing to schedule: call the idle handler */
1241 if (!next_sv) 1258 if (expect_false (!next_sv))
1242 { 1259 {
1243 dSP; 1260 dSP;
1244 UNLOCK; 1261 UNLOCK;
1245 1262
1246 ENTER; 1263 ENTER;
… …
1256 } 1273 }
1257 1274
1258 ta->next = SvSTATE (next_sv); 1275 ta->next = SvSTATE (next_sv);
1259 1276
1260 /* cannot transfer to destroyed coros, skip and look for next */ 1277 /* cannot transfer to destroyed coros, skip and look for next */
1261 if (ta->next->flags & CF_DESTROYED) 1278 if (expect_false (ta->next->flags & CF_DESTROYED))
1262 { 1279 {
1263 UNLOCK; 1280 UNLOCK;
1264 SvREFCNT_dec (next_sv); 1281 SvREFCNT_dec (next_sv);
1265 /* coro_nready is already taken care of by destroy */ 1282 /* coro_nready is already taken care of by destroy */
1266 continue; 1283 continue;
… …
1322 dTHX; 1339 dTHX;
1323 struct transfer_args ta; 1340 struct transfer_args ta;
1324 1341
1325 prepare_cede (aTHX_ &ta); 1342 prepare_cede (aTHX_ &ta);
1326 1343
1327 if (ta.prev != ta.next) 1344 if (expect_true (ta.prev != ta.next))
1328 { 1345 {
1329 TRANSFER (ta); 1346 TRANSFER (ta);
1330 return 1; 1347 return 1;
1331 } 1348 }
1332 else 1349 else
… …
1425 1442
1426 coro->hv = hv = newHV (); 1443 coro->hv = hv = newHV ();
1427 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP; 1444 sv_magicext ((SV *)hv, 0, PERL_MAGIC_ext, &coro_state_vtbl, (char *)coro, 0)->mg_flags |= MGf_DUP;
1428 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1)); 1445 RETVAL = sv_bless (newRV_noinc ((SV *)hv), gv_stashpv (klass, 1));
1429 1446
1447 av_extend (coro->args, items - 1);
1430 for (i = 1; i < items; i++) 1448 for (i = 1; i < items; i++)
1431 av_push (coro->args, newSVsv (ST (i))); 1449 av_push (coro->args, newSVsv (ST (i)));
1432} 1450}
1433 OUTPUT: 1451 OUTPUT:
1434 RETVAL 1452 RETVAL
… …
1477 } 1495 }
1478 1496
1479 BARRIER; 1497 BARRIER;
1480 TRANSFER (ta); 1498 TRANSFER (ta);
1481 1499
1482 if (GIMME_V != G_VOID && ta.next != ta.prev) 1500 if (expect_false (GIMME_V != G_VOID && ta.next != ta.prev))
1483 XSRETURN_YES; 1501 XSRETURN_YES;
1484} 1502}
1485 1503
1486bool 1504bool
1487_destroy (SV *coro_sv) 1505_destroy (SV *coro_sv)

Diff Legend

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