ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

inline RSHashTableMixin.getNodes into RSWidgetMixin.getParentId to reduce allocations

Browse Source
This commit is contained in:
Max Weber
2018-03-03 19:57:09 -07:00
parent 6bedcc2c7a
commit 2e80d972fe
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
runelite-mixins/src/main/java/net/runelite/mixins/RSHashTableMixin.java
View File

@@ -40,6 +40,7 @@ public abstract class RSHashTableMixin implements RSHashTable
@Override @Override
public Collection<Node> getNodes() public Collection<Node> getNodes()
{ {
// Copied in RSWidgetMixin.getParentId to reduce allocations
List<Node> nodes = new ArrayList<Node>(); List<Node> nodes = new ArrayList<Node>();
RSNode[] buckets = getBuckets(); RSNode[] buckets = getBuckets();

22
runelite-mixins/src/main/java/net/runelite/mixins/RSWidgetMixin.java
View File

@@ -43,6 +43,7 @@ import net.runelite.api.widgets.WidgetItem;
import static net.runelite.client.callback.Hooks.eventBus; import static net.runelite.client.callback.Hooks.eventBus;
import net.runelite.rs.api.RSClient; import net.runelite.rs.api.RSClient;
import net.runelite.rs.api.RSHashTable; import net.runelite.rs.api.RSHashTable;
import net.runelite.rs.api.RSNode;
import net.runelite.rs.api.RSWidget; import net.runelite.rs.api.RSWidget;
@Mixin(RSWidget.class) @Mixin(RSWidget.class)
@@ -76,18 +77,27 @@ public abstract class RSWidgetMixin implements RSWidget
return parentId; return parentId;
} }
int i = TO_GROUP(getId()); int groupId = TO_GROUP(getId());
RSHashTable componentTable = client.getComponentTable(); RSHashTable componentTable = client.getComponentTable();
for (Node node : componentTable.getNodes()) RSNode[] buckets = componentTable.getBuckets();
for (int i = 0; i < buckets.length; ++i)
{ {
WidgetNode wn = (WidgetNode) node; Node node = buckets[i];
if (i == wn.getId()) // It looks like the first node in the bucket is always
// a sentinel
Node cur = node.getNext();
while (cur != node)
{ {
return (int) wn.getHash(); WidgetNode wn = (WidgetNode) cur;
if (groupId == wn.getId())
{
return (int) wn.getHash();
}
cur = cur.getNext();
} }
} }
return -1; return -1;
} }