mirror of
https://github.com/DSheirer/sdrtrunk.git
synced 2026-11-12 16:47:31 -05:00
Performance improvements (#746)
* 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:
@@ -39,6 +39,7 @@ import io.github.dsheirer.sample.Listener;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.util.EnumMap;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
import java.util.prefs.Preferences;
|
||||
@@ -54,8 +55,8 @@ public class TalkgroupFormatPreference extends Preference
|
||||
public static final String TALKGROUP_FORMAT_PROPERTY = "talkgroup.format.";
|
||||
public static final String TALKGROUP_FIXED_WIDTH_PROPERTY = "talkgroup.fixed.width.";
|
||||
|
||||
private Map<Protocol,IntegerFormat> mTalkgroupFormatProtocolMap = new HashMap<>();
|
||||
private Map<Protocol,Boolean> mTalkgroupFixedWidthProtocolMap = new HashMap<>();
|
||||
private Map<Protocol,IntegerFormat> mTalkgroupFormatProtocolMap = new EnumMap<>(Protocol.class);
|
||||
private Map<Protocol,Boolean> mTalkgroupFixedWidthProtocolMap = new EnumMap<>(Protocol.class);
|
||||
|
||||
/**
|
||||
* Constructs an instance of identifier formatting preference.
|
||||
@@ -214,9 +215,9 @@ public class TalkgroupFormatPreference extends Preference
|
||||
*/
|
||||
public IntegerFormat getTalkgroupFormat(Protocol protocol)
|
||||
{
|
||||
if(mTalkgroupFormatProtocolMap.containsKey(protocol))
|
||||
{
|
||||
return mTalkgroupFormatProtocolMap.get(protocol);
|
||||
IntegerFormat mapValue = mTalkgroupFormatProtocolMap.get(protocol);
|
||||
if (mapValue != null) {
|
||||
return mapValue;
|
||||
}
|
||||
|
||||
return IntegerFormat.DECIMAL;
|
||||
|
||||
Reference in New Issue
Block a user