Skip to content

[#51] Fix performance issue with Object Store #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jan 19, 2020
Merged

[#51] Fix performance issue with Object Store #52

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2a28a24
[#51] Fix performance issue with Object Store
Jan 14, 2020
42116ab
[#51] add cache construction in the init method
Jan 14, 2020
afd3c8e
[#51] Add collision handling for object store
Jan 15, 2020
3b519ac
[#51] change object-store to use a dictionary to cache objects
Jan 16, 2020
bfaf5ee
[#51] fix formatting and remove unnecessary variable initialization
Jan 18, 2020
0a6bdb0
[#51] Revert ObjectStore handles code to original implementation
Jan 18, 2020
1c0b627
[#51] fix minor formatting error
Jan 18, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 18 additions & 59 deletions Unity/Assets/NativeScript/Bindings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.Collections;
using System.IO;
using System.Runtime.InteropServices;
using System.Collections.Generic;

using UnityEngine;

Expand All @@ -24,25 +25,25 @@ public static class Bindings
// Holds objects and provides handles to them in the form of ints
public static class ObjectStore
{
// Lookup handles by object.
static Dictionary<object, int> objectHandleCache;

// Stored objects. The first is never used so 0 can be "null".
static object[] objects;
// Stack of available handles

// Stack of available handles.
static int[] handles;

// Hash table of stored objects to their handles.
static object[] keys;
static int[] values;


// Index of the next available handle
static int nextHandleIndex;

// The maximum number of objects to store. Must be positive.
static int maxObjects;

public static void Init(int maxObjects)
{
ObjectStore.maxObjects = maxObjects;
objectHandleCache = new Dictionary<object, int>(maxObjects);

// Initialize the objects as all null plus room for the
// first to always be null.
Expand All @@ -58,10 +59,6 @@ public static void Init(int maxObjects)
handles[i] = handle;
}
nextHandleIndex = maxObjects - 1;

// Initialize the hash table
keys = new object[maxObjects];
values = new int[maxObjects];
}

public static int Store(object obj)
Expand All @@ -80,22 +77,7 @@ public static int Store(object obj)

// Store the object
objects[handle] = obj;

// Insert into the hash table
int initialIndex = (int)(
((uint)obj.GetHashCode()) % maxObjects);
int index = initialIndex;
do
{
if (object.ReferenceEquals(keys[index], null))
{
keys[index] = obj;
values[index] = handle;
break;
}
index = (index + 1) % maxObjects;
}
while (index != initialIndex);
objectHandleCache.Add(obj, handle);

return handle;
}
Expand All @@ -116,19 +98,13 @@ public static int GetHandle(object obj)

lock (objects)
{
// Look up the object in the hash table
int initialIndex = (int)(
((uint)obj.GetHashCode()) % maxObjects);
int index = initialIndex;
do
int handle;

// Get handle from object cache
if (objectHandleCache.TryGetValue(obj, out handle))
{
if (object.ReferenceEquals(keys[index], obj))
{
return values[index];
}
index = (index + 1) % maxObjects;
return handle;
}
while (index != initialIndex);
}

// Object not found
Expand All @@ -152,26 +128,9 @@ public static object Remove(int handle)
// Push the handle onto the stack
nextHandleIndex++;
handles[nextHandleIndex] = handle;

// Remove the object from the hash table
int initialIndex = (int)(
((uint)obj.GetHashCode()) % maxObjects);
int index = initialIndex;
do
{
if (object.ReferenceEquals(keys[index], obj))
{
// Only the key needs to be removed (set to null)
// because values corresponding to null will never
// be read and the values are just integers, so
// we're not holding on to a managed reference that
// will prevent GC.
keys[index] = null;
break;
}
index = (index + 1) % maxObjects;
}
while (index != initialIndex);

// Remove the object from the cache
objectHandleCache.Remove(obj);

return obj;
}
Expand Down