* lily/system.cc (spanner_count): new function

[lilypond.git] / lily / grob-property.cc

diff --git a/lily/grob-property.cc b/lily/grob-property.cc
index d7158d6df510c4c80b4ae8c0f7a306cec7bc15b1..2ea216668a0802fd21f8f75edc81b3a9f2f6d143 100644 (file)
--- a/lily/grob-property.cc
+++ b/lily/grob-property.cc
@@ -19,66 +19,15 @@
 #include "misc.hh"
 #include "item.hh"
 
-/*
-  HASHING_FOR_MUTABLE_PROPS:
-
-  
-  plain, -O0 compile
-  
-user   0m12.400s
-
-sz == 13, -O0 compile
-  
- xdvi trip
-
-user   0m13.780s
-  
-sz == 5
-
-
-user   0m13.000s
-
-sz == 3
-
-
-user   0m13.080s
-
-Hashing doesn't improve the result of grob property lookup, at least
-not with naive hashing. It is possible that the overhead of the
-scm_hash* functions take too much time. One way to solve this is by
-using vector accesses directly, and precompute the hashvalues, similar
-to CACHE_SYMBOLS. That option could only cause slowdowns if the hash
-tables produces weird cache-line trashing.
-
-Second option: we could index immutable props in a hash tab as
-well. This only takes space, since they are immutable no updates are
-needed.  This does take a lot of space, since we must duplicate the
-alists (but not the entries).
-
-*/
 
-// #define HASHING_FOR_MUTABLE_PROPS
 
 SCM
 Grob::get_property_alist_chain (SCM def) const
 {
-#ifndef HASHING_FOR_MUTABLE_PROPS
   return  scm_list_n (mutable_property_alist_,
                      immutable_property_alist_,
                      def,
                      SCM_UNDEFINED);
-#else
-  SCM chain = gh_list (immutable_property_alist_, def, SCM_UNDEFINED);
-  SCM * velts = SCM_VELTS (mutable_property_alist_);
-  int l = SCM_VECTOR_LENGTH(mutable_property_alist_);
-  for (int i = 0; i < l; i++)
-    {
-      if (gh_pair_p (velts[i]))
-       chain = gh_cons ( velts[i], chain);
-    }
-
-  return chain;
-#endif
 }
 
 
@@ -94,12 +43,9 @@ void
 Grob::add_to_list_property (SCM sym, SCM thing) 
 {
   SCM handle
-#ifndef HASHING_FOR_MUTABLE_PROPS
     = scm_sloppy_assq (sym, mutable_property_alist_)
-#else
-    = scm_hashq_get_handle (mutable_property_alist_, sym);
-#endif
     ;
+
   if (handle != SCM_BOOL_F)
     {
       gh_set_cdr_x (handle, gh_cons (thing, gh_cdr (handle)));
@@ -113,12 +59,9 @@ Grob::add_to_list_property (SCM sym, SCM thing)
       handle = scm_sloppy_assq (sym, immutable_property_alist_);
       SCM tail = (handle != SCM_BOOL_F) ? gh_cdr(handle) : SCM_EOL;
       SCM val = gh_cons (thing, tail);
-#ifndef HASHING_FOR_MUTABLE_PROPS
+
       mutable_property_alist_ = gh_cons (gh_cons (sym, val),
                                         mutable_property_alist_);
-#else
-      scm_hashq_set_x (mutable_property_alist_, sym, val);
-#endif
     }
 }
 
@@ -142,29 +85,16 @@ Grob::internal_set_grob_property (SCM s, SCM v)
     }
 #endif
 
-#ifndef HASHING_FOR_MUTABLE_PROPS
   mutable_property_alist_ = scm_assq_set_x (mutable_property_alist_, s, v);
-#else
-  scm_hashq_set_x (mutable_property_alist_, s, v);
-#endif
 }
 
 
 SCM
 Grob::internal_get_grob_property (SCM sym) const
 {
-#ifndef HASHING_FOR_MUTABLE_PROPS
   SCM s = scm_sloppy_assq (sym, mutable_property_alist_);
   if (s != SCM_BOOL_F)
     return ly_cdr (s);
-#else
-  if (mutable_property_alist_ == SCM_EOL)
-    return SCM_EOL;
-  
-  SCM s = scm_hashq_ref (mutable_property_alist_, sym, SCM_EOL);
-  if (s!=SCM_EOL)
-    return s;
-#endif
 
   s = scm_sloppy_assq (sym, immutable_property_alist_);
   
@@ -183,24 +113,7 @@ void
 Grob::substitute_mutable_properties (SCM crit, SCM orig)
 {
   set_break_subsititution(crit);
-#ifndef HASHING_FOR_MUTABLE_PROPS
   mutable_property_alist_ = substitute_mutable_property_alist (orig);
-#else
-  if (orig == SCM_EOL)
-    {
-      mutable_property_alist_ = SCM_EOL;
-      return ;
-    }
-  
-  SCM * src_elts = SCM_VELTS (orig);
-  SCM * dest_elts = SCM_VELTS (mutable_property_alist_);  
-  unsigned int l = SCM_VECTOR_LENGTH(mutable_property_alist_);
-  assert (l == SCM_VECTOR_LENGTH(orig));
-  for (unsigned int i = 0; i < l; i++)
-    {
-      dest_elts[i] = substitute_mutable_property_alist (src_elts[i]);
-    }
-#endif
 }