Depsgraph: Fully switch from string to const char*

This brings up to 10-20% depsgraph build time improvement in the layout
files from the studio repository.

5 files changed, 39 insertions, 36 deletions

diff --git a/source/blender/depsgraph/intern/nodes/deg_node.cc b/source/blender/depsgraph/intern/nodes/deg_node.cc
index 29221357ce8..16f1243b433 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node.cc
@@ -71,7 +71,7 @@ DepsNode::TypeInfo::TypeInfo(eDepsNode_Type type, const char *tname)
 
 DepsNode::DepsNode()
 {
-	name[0] = '\0';
+	name = "";
 }
 
 DepsNode::~DepsNode()
@@ -121,7 +121,7 @@ RootDepsNode::~RootDepsNode()
 	OBJECT_GUARDED_DELETE(time_source, TimeSourceDepsNode);
 }
 
-TimeSourceDepsNode *RootDepsNode::add_time_source(const string &name)
+TimeSourceDepsNode *RootDepsNode::add_time_source(const char *name)
 {
 	if (!time_source) {
 		DepsNodeFactory *factory = deg_get_node_factory(DEPSNODE_TYPE_TIMESOURCE);
@@ -146,7 +146,7 @@ static unsigned int id_deps_node_hash_key(const void *key_v)
 	const IDDepsNode::ComponentIDKey *key =
 	        reinterpret_cast<const IDDepsNode::ComponentIDKey *>(key_v);
 	return hash_combine(BLI_ghashutil_uinthash(key->type),
-	                    BLI_ghashutil_strhash_p(key->name.c_str()));
+	                    BLI_ghashutil_strhash_p(key->name));
 }
 
 static bool id_deps_node_hash_key_cmp(const void *a, const void *b)
@@ -172,7 +172,7 @@ static void id_deps_node_hash_value_free(void *value_v)
 }
 
 /* Initialize 'id' node - from pointer data given. */
-void IDDepsNode::init(const ID *id, const string &UNUSED(subdata))
+void IDDepsNode::init(const ID *id, const char *UNUSED(subdata))
 {
 	/* Store ID-pointer. */
 	BLI_assert(id != NULL);
@@ -203,14 +203,14 @@ IDDepsNode::~IDDepsNode()
 }
 
 ComponentDepsNode *IDDepsNode::find_component(eDepsNode_Type type,
-                                              const string &name) const
+                                              const char *name) const
 {
 	ComponentIDKey key(type, name);
 	return reinterpret_cast<ComponentDepsNode *>(BLI_ghash_lookup(components, &key));
 }
 
 ComponentDepsNode *IDDepsNode::add_component(eDepsNode_Type type,
-                                             const string &name)
+                                             const char *name)
 {
 	ComponentDepsNode *comp_node = find_component(type, name);
 	if (!comp_node) {
@@ -225,7 +225,7 @@ ComponentDepsNode *IDDepsNode::add_component(eDepsNode_Type type,
 	return comp_node;
 }
 
-void IDDepsNode::remove_component(eDepsNode_Type type, const string &name)
+void IDDepsNode::remove_component(eDepsNode_Type type, const char *name)
 {
 	ComponentDepsNode *comp_node = find_component(type, name);
 	if (comp_node) {
@@ -280,7 +280,7 @@ static DepsNodeFactoryImpl<IDDepsNode> DNTI_ID_REF;
 /* Subgraph Node ========================================== */
 
 /* Initialize 'subgraph' node - from pointer data given. */
-void SubgraphDepsNode::init(const ID *id, const string &UNUSED(subdata))
+void SubgraphDepsNode::init(const ID *id, const char *UNUSED(subdata))
 {
 	/* Store ID-ref if provided. */
 	this->root_id = (ID *)id;
diff --git a/source/blender/depsgraph/intern/nodes/deg_node.h b/source/blender/depsgraph/intern/nodes/deg_node.h
index b2262c4bd12..67b2e13d5f6 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node.h
@@ -32,6 +32,8 @@
 
 #include "intern/depsgraph_types.h"
 
+#include "BLI_utildefines.h"
+
 struct ID;
 struct GHash;
 struct Scene;
@@ -57,7 +59,7 @@ struct DepsNode {
 	};
 
 	/* Identifier - mainly for debugging purposes. */
-	string name;
+	const char *name;
 
 	/* Structural type of node. */
 	eDepsNode_Type type;
@@ -90,7 +92,7 @@ struct DepsNode {
 	string full_identifier() const;
 
 	virtual void init(const ID * /*id*/,
-	                  const string &/*subdata*/) {}
+	                  const char * /*subdata*/) {}
 
 	virtual void tag_update(Depsgraph * /*graph*/) {}
 
@@ -129,7 +131,7 @@ struct RootDepsNode : public DepsNode {
 	RootDepsNode();
 	~RootDepsNode();
 
-	TimeSourceDepsNode *add_time_source(const string &name = "");
+	TimeSourceDepsNode *add_time_source(const char *name = "");
 
 	/* scene that this corresponds to */
 	Scene *scene;
@@ -143,26 +145,27 @@ struct RootDepsNode : public DepsNode {
 /* ID-Block Reference */
 struct IDDepsNode : public DepsNode {
 	struct ComponentIDKey {
-		ComponentIDKey(eDepsNode_Type type, const string &name = "")
+		ComponentIDKey(eDepsNode_Type type, const char *name = "")
 		    : type(type), name(name) {}
 
 		bool operator== (const ComponentIDKey &other) const
 		{
-			return type == other.type && name == other.name;
+			return type == other.type &&
+			       STREQ(name, other.name);
 		}
 
 		eDepsNode_Type type;
-		string name;
+		const char *name;
 	};
 
-	void init(const ID *id, const string &subdata);
+	void init(const ID *id, const char *subdata);
 	~IDDepsNode();
 
 	ComponentDepsNode *find_component(eDepsNode_Type type,
-	                                  const string &name = "") const;
+	                                  const char *name = "") const;
 	ComponentDepsNode *add_component(eDepsNode_Type type,
-	                                 const string &name = "");
-	void remove_component(eDepsNode_Type type, const string &name = "");
+	                                 const char *name = "");
+	void remove_component(eDepsNode_Type type, const char *name = "");
 	void clear_components();
 
 	void tag_update(Depsgraph *graph);
@@ -189,7 +192,7 @@ struct IDDepsNode : public DepsNode {
 
 /* Subgraph Reference. */
 struct SubgraphDepsNode : public DepsNode {
-	void init(const ID *id, const string &subdata);
+	void init(const ID *id, const char *subdata);
 	~SubgraphDepsNode();
 
 	/* Instanced graph. */
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.cc b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
index 4c88b38b6f0..9e7357be2b2 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.cc
@@ -57,7 +57,7 @@ static unsigned int comp_node_hash_key(const void *key_v)
 	const ComponentDepsNode::OperationIDKey *key =
 	        reinterpret_cast<const ComponentDepsNode::OperationIDKey *>(key_v);
 	return hash_combine(BLI_ghashutil_uinthash(key->opcode),
-	                    BLI_ghashutil_strhash_p(key->name.c_str()));
+	                    BLI_ghashutil_strhash_p(key->name));
 }
 
 static bool comp_node_hash_key_cmp(const void *a, const void *b)
@@ -94,7 +94,7 @@ ComponentDepsNode::ComponentDepsNode() :
 
 /* Initialize 'component' node - from pointer data given */
 void ComponentDepsNode::init(const ID * /*id*/,
-                             const string & /*subdata*/)
+                             const char * /*subdata*/)
 {
 	/* hook up eval context? */
 	// XXX: maybe this needs a special API?
@@ -113,7 +113,7 @@ ComponentDepsNode::~ComponentDepsNode()
 
 string ComponentDepsNode::identifier() const
 {
-	string &idname = this->owner->name;
+	string idname = this->owner->name;
 
 	char typebuf[16];
 	sprintf(typebuf, "(%d)", type);
@@ -139,7 +139,7 @@ OperationDepsNode *ComponentDepsNode::find_operation(OperationIDKey key) const
 }
 
 OperationDepsNode *ComponentDepsNode::find_operation(eDepsOperation_Code opcode,
-                                                     const string &name,
+                                                     const char *name,
                                                      int name_tag) const
 {
 	OperationIDKey key(opcode, name, name_tag);
@@ -152,7 +152,7 @@ OperationDepsNode *ComponentDepsNode::has_operation(OperationIDKey key) const
 }
 
 OperationDepsNode *ComponentDepsNode::has_operation(eDepsOperation_Code opcode,
-                                                    const string &name,
+                                                    const char *name,
                                                     int name_tag) const
 {
 	OperationIDKey key(opcode, name, name_tag);
@@ -162,7 +162,7 @@ OperationDepsNode *ComponentDepsNode::has_operation(eDepsOperation_Code opcode,
 OperationDepsNode *ComponentDepsNode::add_operation(eDepsOperation_Type optype,
                                                     DepsEvalOperationCb op,
                                                     eDepsOperation_Code opcode,
-                                                    const string &name,
+                                                    const char *name,
                                                     int name_tag)
 {
 	OperationDepsNode *op_node = has_operation(opcode, name, name_tag);
@@ -333,7 +333,7 @@ static DepsNodeFactoryImpl<PoseComponentDepsNode> DNTI_EVAL_POSE;
 /* Bone Component ========================================= */
 
 /* Initialize 'bone component' node - from pointer data given */
-void BoneComponentDepsNode::init(const ID *id, const string &subdata)
+void BoneComponentDepsNode::init(const ID *id, const char *subdata)
 {
 	/* generic component-node... */
 	ComponentDepsNode::init(id, subdata);
@@ -346,7 +346,7 @@ void BoneComponentDepsNode::init(const ID *id, const string &subdata)
 
 	/* bone-specific node data */
 	Object *ob = (Object *)id;
-	this->pchan = BKE_pose_channel_find_name(ob->pose, subdata.c_str());
+	this->pchan = BKE_pose_channel_find_name(ob->pose, subdata);
 }
 
 DEG_DEPSNODE_DEFINE(BoneComponentDepsNode, DEPSNODE_TYPE_BONE, "Bone Component");
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_component.h b/source/blender/depsgraph/intern/nodes/deg_node_component.h
index e0d425a2c14..ec2674a7b13 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_component.h
+++ b/source/blender/depsgraph/intern/nodes/deg_node_component.h
@@ -53,7 +53,7 @@ struct ComponentDepsNode : public DepsNode {
 	struct OperationIDKey
 	{
 		eDepsOperation_Code opcode;
-		string name;
+		const char *name;
 		int name_tag;
 
 		OperationIDKey()
@@ -67,7 +67,7 @@ struct ComponentDepsNode : public DepsNode {
 		          name_tag(-1)
 		{}
 		OperationIDKey(eDepsOperation_Code opcode,
-		               const string &name,
+		               const char *name,
 		               int name_tag)
 		       : opcode(opcode),
 		         name(name),
@@ -85,7 +85,7 @@ struct ComponentDepsNode : public DepsNode {
 		bool operator==(const OperationIDKey &other) const
 		{
 			return (opcode == other.opcode) &&
-			       (name == other.name) &&
+			       (STREQ(name, other.name)) &&
 			       (name_tag == other.name_tag);
 		}
 	};
@@ -94,20 +94,20 @@ struct ComponentDepsNode : public DepsNode {
 	ComponentDepsNode();
 	~ComponentDepsNode();
 
-	void init(const ID *id, const string &subdata);
+	void init(const ID *id, const char *subdata);
 
 	string identifier() const;
 
 	/* Find an existing operation, will throw an assert() if it does not exist. */
 	OperationDepsNode *find_operation(OperationIDKey key) const;
 	OperationDepsNode *find_operation(eDepsOperation_Code opcode,
-	                                  const string &name,
+	                                  const char *name,
 	                                  int name_tag) const;
 
 	/* Check operation exists and return it. */
 	OperationDepsNode *has_operation(OperationIDKey key) const;
 	OperationDepsNode *has_operation(eDepsOperation_Code opcode,
-	                                 const string &name,
+	                                 const char *name,
 	                                 int name_tag) const;
 
 	/**
@@ -126,7 +126,7 @@ struct ComponentDepsNode : public DepsNode {
 	OperationDepsNode *add_operation(eDepsOperation_Type optype,
 	                                 DepsEvalOperationCb op,
 	                                 eDepsOperation_Code opcode,
-	                                 const string &name,
+	                                 const char *name,
 	                                 int name_tag);
 
 	void clear_operations();
@@ -206,7 +206,7 @@ struct PoseComponentDepsNode : public ComponentDepsNode {
 
 /* Bone Component */
 struct BoneComponentDepsNode : public ComponentDepsNode {
-	void init(const ID *id, const string &subdata);
+	void init(const ID *id, const char *subdata);
 
 	struct bPoseChannel *pchan;     /* the bone that this component represents */
 
diff --git a/source/blender/depsgraph/intern/nodes/deg_node_operation.cc b/source/blender/depsgraph/intern/nodes/deg_node_operation.cc
index 5847af29ac2..9eed4dfe8d8 100644
--- a/source/blender/depsgraph/intern/nodes/deg_node_operation.cc
+++ b/source/blender/depsgraph/intern/nodes/deg_node_operation.cc
@@ -68,7 +68,7 @@ string OperationDepsNode::full_identifier() const
 {
 	string owner_str = "";
 	if (owner->type == DEPSNODE_TYPE_BONE) {
-		owner_str = owner->owner->name + "." + owner->name;
+		owner_str = string(owner->owner->name) + "." + owner->name;
 	}
 	else {
 		owner_str = owner->owner->name;