X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fengraver-group-engraver.cc;h=37811f925b4017d5798698cb1f64c2b70f6930b7;hb=7e79448be56dad04b97e89e0c49dce64bf16100e;hp=9a39034b379b7f8f765bc684ef3de3fb8a2fada8;hpb=7767222b7b3e715ef3f0090213cc855db3394f8c;p=lilypond.git diff --git a/lily/engraver-group-engraver.cc b/lily/engraver-group-engraver.cc index 9a39034b37..37811f925b 100644 --- a/lily/engraver-group-engraver.cc +++ b/lily/engraver-group-engraver.cc @@ -1,69 +1,26 @@ /* - engravergroup.cc -- implement Engraver_group_engraver + engraver-group-engraver.cc -- implement Engraver_group_engraver source file of the GNU LilyPond music typesetter - (c) 1997--2002 Han-Wen Nienhuys + (c) 1997--2005 Han-Wen Nienhuys */ -#include "flower-proto.hh" #include "engraver-group-engraver.hh" -#include "engraver.hh" + +#include "flower-proto.hh" #include "warn.hh" #include "paper-score.hh" #include "grob.hh" +#include "context.hh" void Engraver_group_engraver::announce_grob (Grob_info info) { announce_infos_.push (info); - Engraver::announce_grob (info); -} - -void -Engraver_group_engraver::process_acknowledged_grobs_in_simple_children () -{ - for (SCM p = simple_trans_list_; gh_pair_p (p); p = ly_cdr (p)) - { - Translator * t = unsmob_translator (ly_car (p)); - Engraver * eng = dynamic_cast (t); - if (eng) - eng->process_acknowledged_grobs (); - } + get_daddy_engraver ()->announce_grob (info); } -/* - - Done: eliminating useless broadcast/acknowledge - - -One cause for translation slowness: grob broadcasted/acknowledges - (b/a): every grob is b/a-ed to all peer-engravers and all -parent-engravers. This means that lots of (often) useless b/a is done -for large scores (the top-level engravers gets to know every detail of -every voice, thread, etc. Measurements indicate this is 10% of the - interpretation time: - - standchen - -old: (pre 1.5.13) 10.28 -new: 8.73 -speedup: 15 % - -Coriolan: - -new: 197.59 -old: 219.12 seconds -speedup: 10% - - -The cost of this B/A is # of useless engravers * cost of one ack, -which is rather low, since cost of one ack is only an interface check. -The cost of precomputing engraver lists has two elts: computing the -list itself, GC for the structure, looking up the list during the -acks. - -*/ SCM find_acknowledge_engravers (SCM gravlist, SCM meta); SCM find_accept_engravers (SCM gravlist, SCM music_descr); @@ -71,21 +28,20 @@ void Engraver_group_engraver::acknowledge_grobs () { if (!announce_infos_.size ()) - return ; - + return; + SCM tab = get_property ("acknowledgeHashTable"); SCM name_sym = ly_symbol2scm ("name"); - SCM meta_sym = ly_symbol2scm ("meta"); + SCM meta_sym = ly_symbol2scm ("meta"); - - for (int j =0; j < announce_infos_.size (); j++) + for (int j = 0; j < announce_infos_.size (); j++) { Grob_info info = announce_infos_[j]; - - SCM meta = info.grob_->internal_get_grob_property (meta_sym); + + SCM meta = info.grob_->internal_get_property (meta_sym); SCM nm = scm_assoc (name_sym, meta); - if (gh_pair_p (nm)) - nm = ly_cdr (nm); + if (scm_is_pair (nm)) + nm = scm_cdr (nm); else { /* @@ -96,127 +52,163 @@ Engraver_group_engraver::acknowledge_grobs () We ignore the grob anyway. He who has no name, shall not be helped. */ - + continue; } - + SCM acklist = scm_hashq_ref (tab, nm, SCM_UNDEFINED); if (acklist == SCM_BOOL_F) { - acklist= find_acknowledge_engravers (gh_cons (self_scm (), simple_trans_list_), meta); + acklist = find_acknowledge_engravers (scm_cons (self_scm (), get_simple_trans_list ()), meta); scm_hashq_set_x (tab, nm, acklist); } - for (SCM p = acklist; gh_pair_p (p); p = ly_cdr (p)) + for (SCM p = acklist; scm_is_pair (p); p = scm_cdr (p)) { - Translator * t = unsmob_translator (ly_car (p)); - Engraver * eng = dynamic_cast (t); - if (eng && eng!= info.origin_trans_) + Translator *t = unsmob_translator (scm_car (p)); + Engraver *eng = dynamic_cast (t); + if (eng && eng != info.origin_trans_) eng->acknowledge_grob (info); } } } -void -Engraver_group_engraver::do_announces () +/* + Ugh. This is slightly expensive. We could/should cache the value of + the group count? +*/ +int +Engraver_group_engraver::pending_grob_count () const { - for (SCM p = trans_group_list_; gh_pair_p (p); p =ly_cdr (p)) + int count = announce_infos_.size (); + for (SCM s = context ()->children_contexts (); + scm_is_pair (s); s = scm_cdr (s)) { - Translator * t = unsmob_translator (ly_car (p)); - dynamic_cast (t)->do_announces (); - } + Context *c = unsmob_context (scm_car (s)); + Engraver_group_engraver *group + = dynamic_cast (c->implementation ()); - process_acknowledged_grobs_in_simple_children (); - - do - { - acknowledge_grobs (); - announce_infos_.clear (); - process_acknowledged_grobs_in_simple_children (); + if (group) + count += group->pending_grob_count (); } - while (announce_infos_.size ()); + return count; } - - -/* - order is : top to bottom (as opposed to do_announces) - */ void -Engraver_group_engraver::process_music () +Engraver_group_engraver::do_announces () { - for (SCM p = simple_trans_list_; gh_pair_p (p); p =ly_cdr (p)) + do { - Translator * t = unsmob_translator (ly_car (p)); - Engraver * eng = dynamic_cast (t); + for (SCM s = context ()->children_contexts (); + scm_is_pair (s); s = scm_cdr (s)) + { + Context *c = unsmob_context (scm_car (s)); + Engraver_group_engraver *group + = dynamic_cast (c->implementation ()); + if (group) + group->do_announces (); + } - if (eng) - eng->process_music (); - } - for (SCM p = trans_group_list_; gh_pair_p (p); p =ly_cdr (p)) - { - Translator * t = unsmob_translator (ly_car (p)); - Engraver*eng = dynamic_cast (t); - if (eng) - eng->process_music (); + while (1) + { + engraver_each (get_simple_trans_list (), + &Engraver::process_acknowledged_grobs); + + if (announce_infos_.size () == 0) + break; + + acknowledge_grobs (); + announce_infos_.clear (); + } } + while (pending_grob_count () > 0); } void Engraver_group_engraver::initialize () { - /* - docme: why bool_f. - - */ - SCM tab = scm_make_vector (gh_int2scm (61), SCM_BOOL_F); - set_property ("acknowledgeHashTable", tab); + SCM tab = scm_make_vector (scm_int2num (61), SCM_BOOL_F); + context ()->set_property ("acknowledgeHashTable", tab); Translator_group::initialize (); } -Engraver_group_engraver::Engraver_group_engraver() {} - -ENTER_DESCRIPTION(Engraver_group_engraver, -/* descr */ "A group of engravers taken together", -/* creats*/ "", -/* accepts */ "", -/* acks */ "", -/* reads */ "", -/* write */ ""); - +Engraver_group_engraver::Engraver_group_engraver () {} +ADD_TRANSLATOR (Engraver_group_engraver, + /* descr */ "A group of engravers taken together", + /* creats*/ "", + /* accepts */ "", + /* acks */ "", + /* reads */ "", + /* write */ ""); /*****************/ - -bool engraver_valid (Translator*tr, SCM ifaces) +bool +engraver_valid (Translator *tr, SCM ifaces) { - SCM ack_ifs = scm_assoc (ly_symbol2scm ("interfaces-acked"), tr->translator_description()); - ack_ifs = gh_cdr (ack_ifs); - for (SCM s = ifaces; ly_pair_p (s); s = ly_cdr (s)) - if (scm_memq (ly_car (s), ack_ifs) != SCM_BOOL_F) + SCM ack_ifs = scm_assoc (ly_symbol2scm ("interfaces-acked"), tr->translator_description ()); + ack_ifs = scm_cdr (ack_ifs); + for (SCM s = ifaces; scm_is_pair (s); s = scm_cdr (s)) + if (scm_c_memq (scm_car (s), ack_ifs) != SCM_BOOL_F) return true; return false; } - - SCM find_acknowledge_engravers (SCM gravlist, SCM meta_alist) { - SCM ifaces = gh_cdr (scm_assoc (ly_symbol2scm ("interfaces"), meta_alist)); + SCM ifaces = scm_cdr (scm_assoc (ly_symbol2scm ("interfaces"), meta_alist)); SCM l = SCM_EOL; - for (SCM s = gravlist; ly_pair_p (s); s = ly_cdr (s)) + for (SCM s = gravlist; scm_is_pair (s); s = scm_cdr (s)) { - Translator* tr = unsmob_translator (ly_car (s)); + Translator *tr = unsmob_translator (scm_car (s)); if (engraver_valid (tr, ifaces)) - l = scm_cons (tr->self_scm (), l); + l = scm_cons (tr->self_scm (), l); } l = scm_reverse_x (l, SCM_EOL); return l; } +/* c&p engraver-group.cc */ +void +recurse_down_engravers (Context *c, Engraver_method ptr, bool context_first) +{ + Engraver_group_engraver *tg + = dynamic_cast (c->implementation ()); + if (!context_first) + { + engraver_each (tg->get_simple_trans_list (), + ptr); + + (tg->*ptr) (); + } + + for (SCM s = c->children_contexts (); scm_is_pair (s); + s = scm_cdr (s)) + { + recurse_down_engravers (unsmob_context (scm_car (s)), ptr, context_first); + } + + if (context_first) + { + engraver_each (tg->get_simple_trans_list (), + ptr); + (tg->*ptr) (); + } +} + +void +engraver_each (SCM list, Engraver_method method) +{ + for (SCM p = list; scm_is_pair (p); p = scm_cdr (p)) + { + Engraver *e = dynamic_cast (unsmob_translator (scm_car (p))); + if (e) + (e->*method) (); + } +}