Fix LGTM warning, potential int overflow bug

nitsanw · nitsanw · commit 15d944c72be2 · 2019-11-06T14:04:21.000+02:00
diff --git a/jctools-core/src/main/java/org/jctools/maps/ConcurrentAutoTable.java b/jctools-core/src/main/java/org/jctools/maps/ConcurrentAutoTable.java
@@ -15,7 +15,7 @@
 import static org.jctools.util.UnsafeAccess.UNSAFE;
 
 import java.io.Serializable;
-import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; 
+import java.util.concurrent.atomic.AtomicReferenceFieldUpdater;
 
 
 /**
@@ -49,7 +49,7 @@ public class ConcurrentAutoTable implements Serializable {
   /** Atomically set the sum of the striped counters to specified value.
    *  Rather more expensive than a simple store, in order to remain atomic.
    */
-  public void set( long x ) { 
+  public void set( long x ) {
     CAT newcat = new CAT(null,4,x);
     // Spin until CAS works
     while( !CAS_cat(_cat,newcat) ) {/*empty*/}
@@ -76,7 +76,7 @@ public void set( long x ) {
    * Return the counter's {@code long} value converted to a string.
    */
   public String toString() { return _cat.toString(); }
-  
+
   /**
    * A more verbose print than {@link #toString}, showing internal structure.
    * Useful for debugging.
@@ -109,18 +109,18 @@ private static int hash() {
 
   // --- CAT -----------------------------------------------------------------
   private static class CAT implements Serializable {
-    
+
     // Unsafe crud: get a function which will CAS arrays
     private static final int _Lbase  = UNSAFE.arrayBaseOffset(long[].class);
     private static final int _Lscale = UNSAFE.arrayIndexScale(long[].class);
     private static long rawIndex(long[] ary, int i) {
       assert i >= 0 && i < ary.length;
-      return _Lbase + i * _Lscale;
+      return _Lbase + (i * (long)_Lscale);
     }
     private static boolean CAS( long[] A, int idx, long old, long nnn ) {
       return UNSAFE.compareAndSwapLong( A, rawIndex(A,idx), old, nnn );
     }
-   
+
     //volatile long _resizers;    // count of threads attempting a resize
     //static private final AtomicLongFieldUpdater<CAT> _resizerUpdater =
     //  AtomicLongFieldUpdater.newUpdater(CAT.class, "_resizers");
@@ -136,7 +136,7 @@ private static boolean CAS( long[] A, int idx, long old, long nnn ) {
       _t = new long[sz];
       _t[0] = init;
     }
-    
+
     // Only add 'x' to some slot in table, hinted at by 'hash'.  The sum can
     // overflow.  Value is CAS'd so no counts are lost.  The CAS is attempted
     // ONCE.
@@ -180,7 +180,7 @@ public long add_if( long x, int hash, ConcurrentAutoTable master ) {
       while( master._cat == this && !master.CAS_cat(this,newcat) ) {/*empty*/}
       return old;
     }
-    
+
 
     // Return the current sum of all things in the table.  Writers can be
     // updating the table furiously, so the sum is only locally accurate.
@@ -206,11 +206,11 @@ public long estimate_sum( ) {
     }
 
     public String toString( ) { return Long.toString(sum()); }
-    
-    public void print() { 
+
+    public void print() {
       long[] t = _t;
       System.out.print("["+t[0]);
-      for( int i=1; i<t.length; i++ ) 
+      for( int i=1; i<t.length; i++ )
         System.out.print(","+t[i]);
       System.out.print("]");
       if( _next != null ) _next.print();
diff --git a/jctools-core/src/main/java/org/jctools/maps/NonBlockingIdentityHashMap.java b/jctools-core/src/main/java/org/jctools/maps/NonBlockingIdentityHashMap.java
@@ -78,8 +78,8 @@
  * @author Cliff Click
  * @param <TypeK> the type of keys maintained by this map
  * @param <TypeV> the type of mapped values
- * 
- *  @author Prashant Deva 
+ *
+ *  @author Prashant Deva
  *  Modified from original NonBlockingHashMap to use identity equality.
  *  Uses System.identityHashCode() to calculate hashMap.
  *  Key equality is compared using '=='.
@@ -97,7 +97,7 @@ public class NonBlockingIdentityHashMap<TypeK, TypeV>
   private static final int _Oscale = UNSAFE.arrayIndexScale(Object[].class);
   private static long rawIndex(final Object[] ary, final int idx) {
     assert idx >= 0 && idx < ary.length;
-    return _Obase + idx * _Oscale;
+    return _Obase + (idx * (long)_Oscale);
   }
 
   // --- Setup to use Unsafe
@@ -279,17 +279,17 @@ private final void initialize( int initial_sz ) {
 
   /** Returns the number of key-value mappings in this map.
    *  @return the number of key-value mappings in this map */
-  @Override 
+  @Override
   public int     size       ( )                       { return chm(_kvs).size(); }
   /** Returns <tt>size() == 0</tt>.
    *  @return <tt>size() == 0</tt> */
-  @Override 
+  @Override
   public boolean isEmpty    ( )                       { return size() == 0;      }
 
   /** Tests if the key in the table using the <tt>equals</tt> method.
    * @return <tt>true</tt> if the key is in the table using the <tt>equals</tt> method
    * @throws NullPointerException if the specified key is null  */
-  @Override 
+  @Override
   public boolean containsKey( Object key )            { return get(key) != null; }
 
   /** Legacy method testing if some key maps into the specified value in this
@@ -825,7 +825,7 @@ private final Object[] resize( NonBlockingIdentityHashMap topmap, Object[] kvs)
         //synchronized( this ) { wait(8*megs); }         // Timeout - we always wakeup
         // For now, sleep a tad and see if the 2 guys already trying to make
         // the table actually get around to making it happen.
-        try { Thread.sleep(8*megs); } catch( Exception e ) { }
+        try { Thread.sleep(8l*megs); } catch( Exception e ) { }
       }
       // Last check, since the 'new' below is expensive and there is a chance
       // that another thread slipped in a new thread while we ran the heuristic.
