/*
- 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 <hanwen@cs.uu.nl>
+ (c) 1997--2004 Han-Wen Nienhuys <hanwen@cs.uu.nl>
*/
#include "flower-proto.hh"
#include "engraver-group-engraver.hh"
#include "engraver.hh"
-#include "debug.hh"
+#include "warn.hh"
#include "paper-score.hh"
#include "grob.hh"
+#include "context.hh"
-void
-Engraver_group_engraver::announce_grob (Grob_info info)
-{
- announce_info_arr_.push (info);
- Engraver::announce_grob (info);
-}
void
-Engraver_group_engraver::create_grobs_in_simple_children ()
+Engraver_group_engraver::announce_grob (Grob_info 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<Engraver*> (t);
- if (eng)
- eng->create_grobs ();
- }
+ announce_infos_.push (info);
+ 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'd 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);
+
void
Engraver_group_engraver::acknowledge_grobs ()
{
- if (!announce_info_arr_.size ())
+ if (!announce_infos_.size ())
return ;
SCM tab = get_property ("acknowledgeHashTable");
SCM meta_sym = ly_symbol2scm ("meta");
- for (int j =0; j < announce_info_arr_.size (); j++)
+ for (int j =0; j < announce_infos_.size (); j++)
{
- Grob_info info = announce_info_arr_[j];
+ Grob_info info = announce_infos_[j];
- SCM meta = info.grob_l_->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
{
/*
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));
+ Translator * t = unsmob_translator (scm_car (p));
Engraver * eng = dynamic_cast<Engraver*> (t);
- if (eng && eng!= info.origin_trans_l_)
+ 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<Engraver_group_engraver*> (t)->do_announces ();
- }
+ Context *c = unsmob_context (scm_car (s));
+ Engraver_group_engraver * group
+ =dynamic_cast<Engraver_group_engraver*> (c->implementation ());
- create_grobs_in_simple_children ();
-
- while (announce_info_arr_.size ())
- {
- acknowledge_grobs ();
- announce_info_arr_.clear ();
- create_grobs_in_simple_children ();
+ if (group)
+ count += group->pending_grob_count ();
}
+ return count;
}
-#include <iostream.h>
-
-/*
- 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))
- {
- Translator * t = unsmob_translator (ly_car (p));
- Engraver * eng = dynamic_cast<Engraver*> (t);
+ do {
+ 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<Engraver_group_engraver*> (c->implementation ());
+ if (group)
+ group->do_announces ();
+ }
+
+ do
+ {
+ engraver_each (get_simple_trans_list (),
+ &Engraver::process_acknowledged_grobs);
- 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<Engraver*> (t);
- if (eng)
- eng->process_music ();
- }
+
+ if (announce_infos_.size () == 0)
+ break;
+
+ acknowledge_grobs ();
+ announce_infos_.clear ();
+ }
+ while (1);
+
+ } while (pending_grob_count () > 0);
}
+
+
void
Engraver_group_engraver::initialize ()
{
- SCM tab = scm_make_vector (gh_int2scm (61), SCM_BOOL_F); // magic ->
- 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() {}
+Engraver_group_engraver::Engraver_group_engraver () {}
-ENTER_DESCRIPTION(Engraver_group_engraver,
+ENTER_DESCRIPTION (Engraver_group_engraver,
/* descr */ "A group of engravers taken together",
/* creats*/ "",
-/* acks */ "",
+/* 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);
}
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<Engraver_group_engraver*> (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<Engraver*>(unsmob_translator (scm_car (p)));
+ if (e)
+ (e->*method) ();
+ }
+}
projects / lilypond.git / blobdiff