isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 19:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

pipeline-hash-table: Store the hash value in the entry

Browse Source 
Calculating the hash value for a pipeline can be a bit expensive.
Previously when adding a new pipeline to the hash table we would end
up calculating the hash value once when checking whether the pipeline
is already in the hash table and then again when adding the pipeline
to the hash table. Ideally GHashTable would provide some API to add an
entry with a precalculated hash value to avoid the recalculation, but
seeing as it doesn't do that we can force it to avoid recalculating by
storing the hash value as part of the struct we are using for the key.
That way the hash func passed to GHashTable can simply return the
precalculated value and we can calculate the hash outside of the
GHashTable calls.

Reviewed-by: Robert Bragg <robert@linux.intel.com>

(cherry picked from commit 4a0460a452fd1be382fd5a92d8cfd5e0cdfd4403)
This commit is contained in:
Neil Roberts 2013-03-26 17:53:02 +00:00
parent 3b8d328652
commit 4e03bd47bf
1 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
cogl/cogl-pipeline-hash-table.c
View File

@ -38,6 +38,12 @@ typedef struct
/* The template pipeline */ /* The template pipeline */
CoglPipeline *pipeline; CoglPipeline *pipeline;
/* Calculating the hash is a little bit expensive for pipelines so
* we don't want to do it repeatedly for entries that are already in
* the hash table. Instead we cache the value here and calculate it
* outside of the GHashTable. */
unsigned int hash_value;
/* GHashTable annoyingly doesn't let us pass a user data pointer to /* GHashTable annoyingly doesn't let us pass a user data pointer to
* the hash and equal functions so to work around it we have to * the hash and equal functions so to work around it we have to
* store the pointer in every hash table entry. We will use this * store the pointer in every hash table entry. We will use this
@ -59,12 +65,8 @@ static unsigned int
entry_hash (const void *data) entry_hash (const void *data)
{ {
const CoglPipelineHashTableEntry *entry = data; const CoglPipelineHashTableEntry *entry = data;
const CoglPipelineHashTable *hash = entry->hash;
return _cogl_pipeline_hash (entry->pipeline, return entry->hash_value;
hash->main_state,
hash->layer_state,
0);
} }
static CoglBool static CoglBool
@ -114,7 +116,10 @@ _cogl_pipeline_hash_table_get (CoglPipelineHashTable *hash,
dummy_entry.pipeline = key_pipeline; dummy_entry.pipeline = key_pipeline;
dummy_entry.hash = hash; dummy_entry.hash = hash;
dummy_entry.hash_value = _cogl_pipeline_hash (key_pipeline,
hash->main_state,
hash->layer_state,
0);
entry = g_hash_table_lookup (hash->table, &dummy_entry); entry = g_hash_table_lookup (hash->table, &dummy_entry);
if (entry) if (entry)
@ -125,13 +130,6 @@ _cogl_pipeline_hash_table_get (CoglPipelineHashTable *hash,
"unusual, so something is probably wrong!\n", "unusual, so something is probably wrong!\n",
hash->debug_string); hash->debug_string);
/* XXX: I wish there was a way to insert into a GHashTable with a
* pre-calculated hash value since there is a cost to calculating
* the hash of a CoglPipeline and in this case we know we have
* already called _cogl_pipeline_hash during the lookup so we could
* pass the value through to here to avoid hashing it again.
*/
/* XXX: Any keys referenced by the hash table need to remain valid /* XXX: Any keys referenced by the hash table need to remain valid
* all the while that there are corresponding values, so for now we * all the while that there are corresponding values, so for now we
* simply make a copy of the current authority pipeline. * simply make a copy of the current authority pipeline.
@ -148,6 +146,7 @@ _cogl_pipeline_hash_table_get (CoglPipelineHashTable *hash,
entry = g_slice_new (CoglPipelineHashTableEntry); entry = g_slice_new (CoglPipelineHashTableEntry);
entry->pipeline = cogl_pipeline_copy (key_pipeline); entry->pipeline = cogl_pipeline_copy (key_pipeline);
entry->hash = hash; entry->hash = hash;
entry->hash_value = dummy_entry.hash_value;
g_hash_table_insert (hash->table, entry, entry); g_hash_table_insert (hash->table, entry, entry);