Use Glib string interning (quarks) to make Path/URI operator== very fast.

This avoids a ton of string comparison overhead in Ingen when setting various
properties (e.g. "ingen:value" was compared several times every time a port
value was changed, now this is just a single pointer comparison and the full
round trip of a value change does no string comparison at all, but is still
property based and RDFey).


git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@2408 a436a847-0d15-0410-975c-d299462d15a1

1 files changed, 8 insertions, 3 deletions

diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp
index 7949f316..69d79d1e 100644
--- a/src/client/ObjectModel.cpp
+++ b/src/client/ObjectModel.cpp
@@ -17,6 +17,9 @@
 
 #include "raul/TableImpl.hpp"
 #include "interface/GraphObject.hpp"
+#include "module/ingen_module.hpp"
+#include "module/World.hpp"
+#include "shared/LV2URIMap.hpp"
 #include "ObjectModel.hpp"
 
 using namespace std;
@@ -30,6 +33,7 @@ ObjectModel::ObjectModel(const Path& path)
 	: ResourceImpl(path)
 	, _meta(ResourceImpl::meta_uri(path))
 	, _path(path)
+	, _symbol((path == Path::root) ? "root" : path.symbol())
 {
 }
 
@@ -74,7 +78,7 @@ ObjectModel::get_property(const Raul::URI& key) const
 bool
 ObjectModel::polyphonic() const
 {
-	const Raul::Atom& polyphonic = get_property("ingen:polyphonic");
+	const Raul::Atom& polyphonic = get_property(ingen_get_world()->uris->ingen_polyphonic);
 	return (polyphonic.is_valid() && polyphonic.get_bool());
 }
 
@@ -106,7 +110,8 @@ void
 ObjectModel::set_path(const Raul::Path& p)
 {
 	_path = p;
-	_meta.set_uri(ResourceImpl::meta_uri(_path));
+	_symbol = p.symbol();
+	_meta.set_uri(ResourceImpl::meta_uri(0));
 	signal_moved.emit();
 }
 
@@ -114,7 +119,7 @@ ObjectModel::set_path(const Raul::Path& p)
 void
 ObjectModel::set_parent(SharedPtr<ObjectModel> p)
 {
-	assert(p);
+	assert(_path.is_child_of(p->path()));
 	_parent = p;
 }