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.331 by root, Thu Nov 27 12:00:59 2008 UTC vs.
Revision 1.334 by root, Fri Nov 28 23:30:55 2008 UTC

… …
355 HV *st; 355 HV *st;
356 GV *gvp; 356 GV *gvp;
357 return sv_2cv (sv, &st, &gvp, 0); 357 return sv_2cv (sv, &st, &gvp, 0);
358} 358}
359 359
360/*****************************************************************************/
361/* magic glue */
362
363#define CORO_MAGIC_type_cv 26
364#define CORO_MAGIC_type_state PERL_MAGIC_ext
365
366#define CORO_MAGIC_NN(sv, type) \
367 (expect_true (SvMAGIC (sv)->mg_type == type) \
368 ? SvMAGIC (sv) \
369 : mg_find (sv, type))
370
371#define CORO_MAGIC(sv, type) \
372 (expect_true (SvMAGIC (sv)) \
373 ? CORO_MAGIC_NN (sv, type) \
374 : 0)
375
376#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
377#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
378
379INLINE struct coro *
380SvSTATE_ (pTHX_ SV *coro)
381{
382 HV *stash;
383 MAGIC *mg;
384
385 if (SvROK (coro))
386 coro = SvRV (coro);
387
388 if (expect_false (SvTYPE (coro) != SVt_PVHV))
389 croak ("Coro::State object required");
390
391 stash = SvSTASH (coro);
392 if (expect_false (stash != coro_stash && stash != coro_state_stash))
393 {
394 /* very slow, but rare, check */
395 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
396 croak ("Coro::State object required");
397 }
398
399 mg = CORO_MAGIC_state (coro);
400 return (struct coro *)mg->mg_ptr;
401}
402
403#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
404
405/* faster than SvSTATE, but expects a coroutine hv */
406#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
407#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
408
409/*****************************************************************************/
410/* padlist management and caching */
411
360static AV * 412static AV *
361coro_derive_padlist (pTHX_ CV *cv) 413coro_derive_padlist (pTHX_ CV *cv)
362{ 414{
363 AV *padlist = CvPADLIST (cv); 415 AV *padlist = CvPADLIST (cv);
364 AV *newpadlist, *newpad; 416 AV *newpadlist, *newpad;
… …
371 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1); 423 Perl_pad_push (aTHX_ padlist, AvFILLp (padlist) + 1, 1);
372#endif 424#endif
373 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)]; 425 newpad = (AV *)AvARRAY (padlist)[AvFILLp (padlist)];
374 --AvFILLp (padlist); 426 --AvFILLp (padlist);
375 427
376 av_store (newpadlist, 0, SvREFCNT_inc_NN (*av_fetch (padlist, 0, FALSE))); 428 av_store (newpadlist, 0, SvREFCNT_inc_NN (AvARRAY (padlist)[0]));
377 av_store (newpadlist, 1, (SV *)newpad); 429 av_store (newpadlist, 1, (SV *)newpad);
378 430
379 return newpadlist; 431 return newpadlist;
380} 432}
381 433
… …
385 /* may be during global destruction */ 437 /* may be during global destruction */
386 if (!IN_DESTRUCT) 438 if (!IN_DESTRUCT)
387 { 439 {
388 I32 i = AvFILLp (padlist); 440 I32 i = AvFILLp (padlist);
389 441
390 while (i >= 0) 442 while (i > 0) /* special-case index 0 */
391 { 443 {
392 /* we try to be extra-careful here */ 444 /* we try to be extra-careful here */
393 AV *av = (AV *)AvARRAY (padlist)[i--]; 445 AV *av = (AV *)AvARRAY (padlist)[i--];
394
395 I32 i = AvFILLp (av); 446 I32 j = AvFILLp (av);
396 447
397 while (i >= 0) 448 while (j >= 0)
398 SvREFCNT_dec (AvARRAY (av)[i--]); 449 SvREFCNT_dec (AvARRAY (av)[j--]);
399 450
400 AvFILLp (av) = -1; 451 AvFILLp (av) = -1;
401 SvREFCNT_dec (av); 452 SvREFCNT_dec (av);
402 } 453 }
403 454
455 SvREFCNT_dec (AvARRAY (padlist)[0]);
456
404 AvFILLp (padlist) = -1; 457 AvFILLp (padlist) = -1;
405 SvREFCNT_dec ((SV*)padlist); 458 SvREFCNT_dec ((SV*)padlist);
406 } 459 }
407} 460}
408 461
… …
418 471
419 SvREFCNT_dec (av); /* sv_magicext increased the refcount */ 472 SvREFCNT_dec (av); /* sv_magicext increased the refcount */
420 473
421 return 0; 474 return 0;
422} 475}
423
424#define CORO_MAGIC_type_cv 26
425#define CORO_MAGIC_type_state PERL_MAGIC_ext
426 476
427static MGVTBL coro_cv_vtbl = { 477static MGVTBL coro_cv_vtbl = {
428 0, 0, 0, 0, 478 0, 0, 0, 0,
429 coro_cv_free 479 coro_cv_free
430}; 480};
431
432#define CORO_MAGIC_NN(sv, type) \
433 (expect_true (SvMAGIC (sv)->mg_type == type) \
434 ? SvMAGIC (sv) \
435 : mg_find (sv, type))
436
437#define CORO_MAGIC(sv, type) \
438 (expect_true (SvMAGIC (sv)) \
439 ? CORO_MAGIC_NN (sv, type) \
440 : 0)
441
442#define CORO_MAGIC_cv(cv) CORO_MAGIC (((SV *)(cv)), CORO_MAGIC_type_cv)
443#define CORO_MAGIC_state(sv) CORO_MAGIC_NN (((SV *)(sv)), CORO_MAGIC_type_state)
444
445INLINE struct coro *
446SvSTATE_ (pTHX_ SV *coro)
447{
448 HV *stash;
449 MAGIC *mg;
450
451 if (SvROK (coro))
452 coro = SvRV (coro);
453
454 if (expect_false (SvTYPE (coro) != SVt_PVHV))
455 croak ("Coro::State object required");
456
457 stash = SvSTASH (coro);
458 if (expect_false (stash != coro_stash && stash != coro_state_stash))
459 {
460 /* very slow, but rare, check */
461 if (!sv_derived_from (sv_2mortal (newRV_inc (coro)), "Coro::State"))
462 croak ("Coro::State object required");
463 }
464
465 mg = CORO_MAGIC_state (coro);
466 return (struct coro *)mg->mg_ptr;
467}
468
469#define SvSTATE(sv) SvSTATE_ (aTHX_ (sv))
470
471/* faster than SvSTATE, but expects a coroutine hv */
472#define SvSTATE_hv(hv) ((struct coro *)CORO_MAGIC_NN ((SV *)hv, CORO_MAGIC_type_state)->mg_ptr)
473#define SvSTATE_current SvSTATE_hv (SvRV (coro_current))
474 481
475/* the next two functions merely cache the padlists */ 482/* the next two functions merely cache the padlists */
476static void 483static void
477get_padlist (pTHX_ CV *cv) 484get_padlist (pTHX_ CV *cv)
478{ 485{
… …
931 /* copy throw, in case it was set before coro_setup */ 938 /* copy throw, in case it was set before coro_setup */
932 CORO_THROW = coro->except; 939 CORO_THROW = coro->except;
933} 940}
934 941
935static void 942static void
936coro_destruct (pTHX_ struct coro *coro) 943coro_destruct_perl (pTHX_ struct coro *coro)
937{ 944{
938 if (!IN_DESTRUCT) 945 if (!IN_DESTRUCT)
939 { 946 {
940 /* restore all saved variables and stuff */ 947 /* restore all saved variables and stuff */
941 LEAVE_SCOPE (0); 948 LEAVE_SCOPE (0);
… …
1464 --coro_nready; 1471 --coro_nready;
1465 } 1472 }
1466 else 1473 else
1467 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */ 1474 coro->flags |= CF_READY; /* make sure it is NOT put into the readyqueue */
1468 1475
1469 if (coro->mainstack && coro->mainstack != main_mainstack) 1476 if (coro->mainstack
1477 && coro->mainstack != main_mainstack
1478 && !PL_dirty)
1470 { 1479 {
1471 struct coro temp; 1480 struct coro temp;
1472 1481
1473 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING))); 1482 assert (("FATAL: tried to destroy currently running coroutine (please report)", !(coro->flags & CF_RUNNING)));
1474 1483
1475 save_perl (aTHX_ &temp); 1484 save_perl (aTHX_ &temp);
1476 load_perl (aTHX_ coro); 1485 load_perl (aTHX_ coro);
1477 1486
1478 coro_destruct (aTHX_ coro); 1487 coro_destruct_perl (aTHX_ coro);
1479 1488
1480 load_perl (aTHX_ &temp); 1489 load_perl (aTHX_ &temp);
1481 1490
1482 coro->slot = 0; 1491 coro->slot = 0;
1483 } 1492 }
… …
2918SV * 2927SV *
2919clone (Coro::State coro) 2928clone (Coro::State coro)
2920 CODE: 2929 CODE:
2921{ 2930{
2922#if CORO_CLONE 2931#if CORO_CLONE
2923 struct coro *ncoro = coro_clone (coro); 2932 struct coro *ncoro = coro_clone (aTHX_ coro);
2924 MAGIC *mg; 2933 MAGIC *mg;
2925 /* TODO: too much duplication */ 2934 /* TODO: too much duplication */
2926 ncoro->hv = newHV (); 2935 ncoro->hv = newHV ();
2927 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0); 2936 mg = sv_magicext ((SV *)ncoro->hv, 0, CORO_MAGIC_type_state, &coro_state_vtbl, (char *)ncoro, 0);
2928 mg->mg_flags |= MGf_DUP; 2937 mg->mg_flags |= MGf_DUP;

Diff Legend

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