GitHub/sdrtrunk
1
0
Fork 0
mirror of https://github.com/DSheirer/sdrtrunk.git synced 2026-11-12 16:47:31 -05:00
Code Issues Packages Projects Releases 2 Wiki Activity

Performance improvements (#746)

Browse Source 
* Misc minor performance improvements

* Use more concise loop syntax

* Use more concise Collection sort syntax

* Use StringUtils pad methods

* Optimize some loops and double-map-lookups

* Optimize array instantiation

There are two styles to convert a collection to an array: either
using a pre-sized array (like c.toArray(new String[c.size()])) or
using an empty array (like c.toArray(new String[0]).

In older Java versions using pre-sized array was recommended,
as the reflection call which is necessary to create an array
of proper size was quite slow. However since late updates of
OpenJDK 6 this call was intrinsified, making the performance
of the empty array version the same and sometimes even better,
compared to the pre-sized version. Also passing pre-sized array
is dangerous for a concurrent or synchronized collection as
a data race is possible between the size and toArray call
which may result in extra nulls at the end of the array,
if the collection was concurrently shrunk during the operation.

* Cleanup string concatenation

* Use EnumMap where possible

* Use FastMath instead of Math

* Initialize complex things only once

* Reduce method size to aloow more JIT inlining

* remove map of short->float

* Move field to local variable

* Cleanup Map lookup

Co-authored-by: Rob Ekl <xwq876@zebra.com>
This commit is contained in:
robekl
2020-04-25 07:57:56 -04:00
committed by GitHub
parent 649258bd2b
commit 39f6d6c831
186 changed files with 2840 additions and 3464 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/main/java/io/github/dsheirer/alias/AliasList.java
View File

@@ -45,13 +45,7 @@ import io.github.dsheirer.sample.Listener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import java.util.*;
/**
* List of aliases that share the same alias list name and provides convenient methods for looking up alias
@@ -60,8 +54,8 @@ import java.util.TreeMap;
public class AliasList implements Listener<AliasEvent>
{
private final static Logger mLog = LoggerFactory.getLogger(AliasList.class);
private Map<Protocol,TalkgroupAliasList> mTalkgroupProtocolMap = new HashMap<>();
private Map<Protocol,RadioAliasList> mRadioProtocolMap = new HashMap<>();
private Map<Protocol,TalkgroupAliasList> mTalkgroupProtocolMap = new EnumMap<>(Protocol.class);
private Map<Protocol,RadioAliasList> mRadioProtocolMap = new EnumMap<>(Protocol.class);
private Map<String,Alias> mESNMap = new HashMap<>();
private Map<Integer,Alias> mStatusMap = new HashMap<>();
private boolean mHasAliasActions = false;
@@ -487,15 +481,7 @@ public class AliasList implements Listener<AliasEvent>
*/
public static void remove(Alias alias, Map map)
{
Iterator<Map.Entry> it = map.entrySet().iterator();
while(it.hasNext())
{
if(it.next().getValue().equals(alias))
{
it.remove();
}
}
map.entrySet().removeIf(entry -> alias.equals(((Map.Entry)entry).getValue()));
}
@@ -515,16 +501,17 @@ public class AliasList implements Listener<AliasEvent>
{
int value = identifier.getValue();
if(mTalkgroupAliasMap.containsKey(value))
Alias mapValue = mTalkgroupAliasMap.get(value);
if (mapValue != null)
{
return mTalkgroupAliasMap.get(value);
return mapValue;
}
for(TalkgroupRange talkgroupRange: mTalkgroupRangeAliasMap.keySet())
for(Map.Entry<TalkgroupRange, Alias> entry : mTalkgroupRangeAliasMap.entrySet())
{
if(talkgroupRange.contains(value))
if(entry.getKey().contains(value))
{
return mTalkgroupRangeAliasMap.get(talkgroupRange);
return entry.getValue();
}
}
@@ -601,16 +588,17 @@ public class AliasList implements Listener<AliasEvent>
{
int value = identifier.getValue();
if(mRadioAliasMap.containsKey(value))
Alias mapValue = mRadioAliasMap.get(value);
if(mapValue != null)
{
return mRadioAliasMap.get(value);
return mapValue;
}
for(RadioRange radioRange: mRadioRangeAliasMap.keySet())
for(Map.Entry<RadioRange, Alias> entry : mRadioRangeAliasMap.entrySet())
{
if(radioRange.contains(value))
if(entry.getKey().contains(value))
{
return mRadioRangeAliasMap.get(radioRange);
return entry.getValue();
}
}

6
src/main/java/io/github/dsheirer/alias/AliasModel.java
View File

@@ -117,9 +117,9 @@ public class AliasModel extends AbstractTableModel
return new AliasList(name);
}
if(mAliasListMap.containsKey(name))
{
return mAliasListMap.get(name);
AliasList mapValue = mAliasListMap.get(name);
if (mapValue != null) {
return mapValue;
}
AliasList aliasList = new AliasList(name);

6
src/main/java/io/github/dsheirer/alias/AliasNameEditor.java
View File

@@ -115,7 +115,7 @@ public class AliasNameEditor extends Editor<Alias>
else
{
mGroupCombo.setModel(new DefaultComboBoxModel<String>(
groups.toArray(new String[groups.size()])));
groups.toArray(new String[0])));
;
}
}
@@ -243,7 +243,7 @@ public class AliasNameEditor extends Editor<Alias>
else
{
mListCombo.setModel(new DefaultComboBoxModel<String>(
listNames.toArray(new String[listNames.size()])));
listNames.toArray(new String[0])));
;
}
@@ -258,7 +258,7 @@ public class AliasNameEditor extends Editor<Alias>
else
{
mGroupCombo.setModel(new DefaultComboBoxModel<String>(
groupNames.toArray(new String[groupNames.size()])));
groupNames.toArray(new String[0])));
;
}

10
src/main/java/io/github/dsheirer/alias/MultipleAliasEditor.java
View File

@@ -266,15 +266,15 @@ public class MultipleAliasEditor extends Editor<List<Alias>>
List<String> listNames = mAliasModel.getListNames();
listNames.add(0, "");
mListCombo.setModel(new DefaultComboBoxModel<String>(
listNames.toArray(new String[listNames.size()])));
listNames.toArray(new String[0])));
List<String> groupNames = mAliasModel.getGroupNames();
groupNames.add(0, "");
mGroupCombo.setModel(new DefaultComboBoxModel<String>(
groupNames.toArray(new String[groupNames.size()])));
groupNames.toArray(new String[0])));
List<String> streamNames = mBroadcastModel.getBroadcastConfigurationNames();
mStreamCombo.setModel(new DefaultComboBoxModel<String>(streamNames.toArray(new String[streamNames.size()])));
mStreamCombo.setModel(new DefaultComboBoxModel<String>(streamNames.toArray(new String[0])));
mIconCombo.setModel(new DefaultComboBoxModel<>(mIconManager.getIcons()));
@@ -300,12 +300,12 @@ public class MultipleAliasEditor extends Editor<List<Alias>>
List<String> listNames = mAliasModel.getListNames();
listNames.add(0, "");
mListCombo.setModel(new DefaultComboBoxModel<String>(
listNames.toArray(new String[listNames.size()])));
listNames.toArray(new String[0])));
List<String> groupNames = mAliasModel.getGroupNames();
groupNames.add(0, "");
mGroupCombo.setModel(new DefaultComboBoxModel<String>(
groupNames.toArray(new String[groupNames.size()])));
groupNames.toArray(new String[0])));
mButtonColor.setForeground(getForeground());
mButtonColor.setBackground(getBackground());

9
src/main/java/io/github/dsheirer/alias/action/AliasActionEditor.java
View File

@@ -188,14 +188,7 @@ public class AliasActionEditor extends Editor<Alias>
List<AliasAction> actions = alias.getAction();
Collections.sort( actions, new Comparator<AliasAction>()
{
@Override
public int compare( AliasAction o1, AliasAction o2 )
{
return o1.toString().compareTo( o2.toString() );
}
} );
actions.sort(Comparator.comparing(Object::toString));
for( AliasAction action: actions )
{

9
src/main/java/io/github/dsheirer/alias/id/AliasIdentifierEditor.java
View File

@@ -227,14 +227,7 @@ public class AliasIdentifierEditor extends Editor<Alias>
List<AliasID> ids = alias.getId();
Collections.sort(ids, new Comparator<AliasID>()
{
@Override
public int compare(AliasID o1, AliasID o2)
{
return o1.toString().compareTo(o2.toString());
}
});
ids.sort(Comparator.comparing(Object::toString));
for(AliasID id : ids)
{

5
src/main/java/io/github/dsheirer/alias/id/WildcardID.java
View File

@@ -19,6 +19,7 @@
package io.github.dsheirer.alias.id;
import org.apache.commons.lang3.Validate;
import org.apache.commons.math3.util.FastMath;
import java.util.regex.Pattern;
@@ -95,12 +96,12 @@ public class WildcardID implements Comparable<WildcardID>
{
if(mValue.substring(x, x + 1).equals(WILDCARD))
{
weight += (int)(Math.pow(2, mValue.length() - x - 1)); //Position weight
weight += (int)(FastMath.pow(2, mValue.length() - x - 1)); //Position weight
characterCount++;
}
}
weight += (int)(Math.pow(2, characterCount)) * 1000; //Character count weight
weight += (int)(FastMath.pow(2, characterCount)) * 1000; //Character count weight
return weight;
}

2
src/main/java/io/github/dsheirer/alias/id/broadcast/BroadcastChannelEditor.java
View File

@@ -61,7 +61,7 @@ public class BroadcastChannelEditor extends DocumentListenerEditor<AliasID>
List<String> channelNames = mBroadcastModel.getBroadcastConfigurationNames();
mBroadcastConfigurations = new JComboBox<String>(channelNames.toArray(new String[channelNames.size()]));
mBroadcastConfigurations = new JComboBox<String>(channelNames.toArray(new String[0]));
mBroadcastConfigurations.addActionListener(new ActionListener()
{
@Override

3
src/main/java/io/github/dsheirer/alias/id/radio/RadioFormatter.java
View File

@@ -29,6 +29,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.text.ParseException;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.Map;
@@ -38,7 +39,7 @@ import java.util.Map;
public class RadioFormatter
{
private final static Logger mLog = LoggerFactory.getLogger(RadioFormatter.class);
private static Map<Protocol,IntegerFormatter> mFormatterMap = new HashMap<>();
private static Map<Protocol,IntegerFormatter> mFormatterMap = new EnumMap<>(Protocol.class);
static
{

3
src/main/java/io/github/dsheirer/alias/id/talkgroup/TalkgroupFormatter.java
View File

@@ -32,6 +32,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.text.ParseException;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.Map;
@@ -41,7 +42,7 @@ import java.util.Map;
public class TalkgroupFormatter
{
private final static Logger mLog = LoggerFactory.getLogger(TalkgroupFormatter.class);
private static Map<Protocol,IntegerFormatter> mFormatterMap = new HashMap<>();
private static Map<Protocol,IntegerFormatter> mFormatterMap = new EnumMap<>(Protocol.class);
static
{