X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fengraver-group-engraver.cc;h=aa25efaa6e457e1d0e0549af72567503e99653b0;hb=ac94780f53268682e00c7fd186e1f9d0520ca25c;hp=610b9890ec062c21ca82fb4b8aa3d5e2bad1b968;hpb=fd7e615444cf58b38283a59b56d3457c07778397;p=lilypond.git diff --git a/lily/engraver-group-engraver.cc b/lily/engraver-group-engraver.cc index 610b9890ec..aa25efaa6e 100644 --- a/lily/engraver-group-engraver.cc +++ b/lily/engraver-group-engraver.cc @@ -3,87 +3,220 @@ source file of the GNU LilyPond music typesetter - (c) 1997--1999 Han-Wen Nienhuys + (c) 1997--2003 Han-Wen Nienhuys */ -#include "proto.hh" +#include "flower-proto.hh" #include "engraver-group-engraver.hh" #include "engraver.hh" -#include "debug.hh" +#include "warn.hh" #include "paper-score.hh" -#include "score-element.hh" - - -ADD_THIS_TRANSLATOR(Engraver_group_engraver); +#include "grob.hh" void -Engraver_group_engraver::announce_element (Score_element_info info) +Engraver_group_engraver::announce_grob (Grob_info info) { - announce_info_arr_.push (info); - Engraver::announce_element (info); + announce_infos_.push (info); + Engraver::announce_grob (info); } void -Engraver_group_engraver::do_announces() +Engraver_group_engraver::process_acknowledged_grobs_in_simple_children () { - for (Cons *p = trans_p_list_.head_; p; p = p->next_) + for (SCM p = simple_trans_list_; gh_pair_p (p); p = ly_cdr (p)) { - if (Engraver_group_engraver *trg = dynamic_cast (p->car_)) - trg->do_announces (); + Translator * t = unsmob_translator (ly_car (p)); + Engraver * eng = dynamic_cast (t); + if (eng) + eng->process_acknowledged_grobs (); } +} + +/* + + 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: - Request dummy_req; + 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); - while (announce_info_arr_.size ()) +void +Engraver_group_engraver::acknowledge_grobs () +{ + if (!announce_infos_.size ()) + return ; + + SCM tab = get_property ("acknowledgeHashTable"); + SCM name_sym = ly_symbol2scm ("name"); + SCM meta_sym = ly_symbol2scm ("meta"); + + + for (int j =0; j < announce_infos_.size (); j++) { - for (int j =0; j < announce_info_arr_.size(); j++) + Grob_info info = announce_infos_[j]; + + SCM meta = info.grob_->internal_get_grob_property (meta_sym); + SCM nm = scm_assoc (name_sym, meta); + if (gh_pair_p (nm)) + nm = ly_cdr (nm); + else { - Score_element_info info = announce_info_arr_[j]; + /* + it's tempting to put an assert for + immutable_property_alist_ == '(), but in fact, some + engravers (clef-engraver) add some more information to the + immutable_property_alist_ (after it has been '()-ed). + + We ignore the grob anyway. He who has no name, shall not + be helped. */ - if (!info.req_l_) - info.req_l_ = &dummy_req; - - for (Cons *p = trans_p_list_.head_; p; p = p->next_) - { - if (!dynamic_cast (p->car_)) - { - Engraver * eng = dynamic_cast (p->car_); - if (eng && eng!= info.origin_trans_l_arr_[0]) - eng->acknowledge_element (info); - } - } + continue; } - - announce_info_arr_.clear (); - for (Cons *p = trans_p_list_.head_; p; p = p->next_) + + SCM acklist = scm_hashq_ref (tab, nm, SCM_UNDEFINED); + if (acklist == SCM_BOOL_F) { - if (!dynamic_cast (p->car_)) - { - Engraver * eng = dynamic_cast (p->car_); - if (eng) - eng->process_acknowledged (); - } + acklist= find_acknowledge_engravers (gh_cons (self_scm (), simple_trans_list_), meta); + scm_hashq_set_x (tab, nm, acklist); + } + + for (SCM p = acklist; gh_pair_p (p); p = ly_cdr (p)) + { + Translator * t = unsmob_translator (ly_car (p)); + Engraver * eng = dynamic_cast (t); + if (eng && eng!= info.origin_trans_) + eng->acknowledge_grob (info); } } } +void +Engraver_group_engraver::do_announces () +{ + for (SCM p = trans_group_list_; gh_pair_p (p); p =ly_cdr (p)) + { + Translator * t = unsmob_translator (ly_car (p)); + dynamic_cast (t)->do_announces (); + } + + process_acknowledged_grobs_in_simple_children (); + + do + { + acknowledge_grobs (); + announce_infos_.clear (); + process_acknowledged_grobs_in_simple_children (); + } + while (announce_infos_.size ()); +} -Staff_info -Engraver_group_engraver::get_staff_info() const + + +/* + order is : top to bottom (as opposed to do_announces) + */ +void +Engraver_group_engraver::process_music () { - Staff_info inf = Engraver::get_staff_info(); + 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); - for (Cons *p = trans_p_list_.head_; p; p = p->next_) + if (eng) + eng->process_music (); + } + for (SCM p = trans_group_list_; gh_pair_p (p); p =ly_cdr (p)) { - if (!dynamic_cast (p->car_)) - { - Engraver * eng = dynamic_cast (p->car_); - if (eng) - eng->fill_staff_info (inf); - } + Translator * t = unsmob_translator (ly_car (p)); + Engraver*eng = dynamic_cast (t); + if (eng) + eng->process_music (); } - return inf; } +void +Engraver_group_engraver::initialize () +{ + /* + docme: why bool_f. + + */ + SCM tab = scm_make_vector (gh_int2scm (61), SCM_BOOL_F); + 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 */ ""); + + + +/*****************/ + + +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) + 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 l = SCM_EOL; + for (SCM s = gravlist; ly_pair_p (s); s = ly_cdr (s)) + { + Translator* tr = unsmob_translator (ly_car (s)); + if (engraver_valid (tr, ifaces)) + l = scm_cons (tr->self_scm (), l); + } + l = scm_reverse_x (l, SCM_EOL); + + return l; +}