You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directmemory.apache.org by si...@apache.org on 2012/02/15 14:10:07 UTC
svn commit: r1244473 - in
/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory:
cache/ measures/ memory/ misc/
Author: simonetripodi
Date: Wed Feb 15 13:10:06 2012
New Revision: 1244473
URL: http://svn.apache.org/viewvc?rev=1244473&view=rev
Log:
dropped Format.it method, replaced with String.format
Modified:
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/cache/CacheServiceImpl.java
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/Monitor.java
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/MonitorServiceImpl.java
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMemoryBufferImpl.java
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMergingMemoryBufferImpl.java
incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/misc/Format.java
Modified: incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/cache/CacheServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/cache/CacheServiceImpl.java?rev=1244473&r1=1244472&r2=1244473&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/cache/CacheServiceImpl.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/cache/CacheServiceImpl.java Wed Feb 15 13:10:06 2012
@@ -19,7 +19,7 @@ package org.apache.directmemory.cache;
* under the License.
*/
-
+import static java.lang.String.format;
import com.google.common.collect.MapMaker;
import org.apache.directmemory.measures.Every;
import org.apache.directmemory.measures.Ram;
@@ -96,9 +96,9 @@ public class CacheServiceImpl
logger.info( "************************************************" );
memoryManager.init( numberOfBuffers, size );
logger.info( "initialized" );
- logger.info( Format.it( "number of buffer(s): \t%1d with %2s each", numberOfBuffers, Ram.inMb( size ) ) );
- logger.info( Format.it( "initial capacity: \t%1d", initialCapacity ) );
- logger.info( Format.it( "concurrency level: \t%1d", concurrencyLevel ) );
+ logger.info( format( "number of buffer(s): \t%1d with %2s each", numberOfBuffers, Ram.inMb( size ) ) );
+ logger.info( format( "initial capacity: \t%1d", initialCapacity ) );
+ logger.info( format( "concurrency level: \t%1d", concurrencyLevel ) );
scheduleDisposalEvery( Every.seconds( 10 ) );
}
@@ -297,12 +297,12 @@ public class CacheServiceImpl
public void dump( OffHeapMemoryBuffer mem )
{
- logger.info( Format.it( "off-heap - buffer: \t%1d", mem.getBufferNumber() ) );
- logger.info( Format.it( "off-heap - allocated: \t%1s", Ram.inMb( mem.capacity() ) ) );
- logger.info( Format.it( "off-heap - used: \t%1s", Ram.inMb( mem.used() ) ) );
- logger.info( Format.it( "heap - max: \t%1s", Ram.inMb( Runtime.getRuntime().maxMemory() ) ) );
- logger.info( Format.it( "heap - allocated: \t%1s", Ram.inMb( Runtime.getRuntime().totalMemory() ) ) );
- logger.info( Format.it( "heap - free : \t%1s", Ram.inMb( Runtime.getRuntime().freeMemory() ) ) );
+ logger.info( format( "off-heap - buffer: \t%1d", mem.getBufferNumber() ) );
+ logger.info( format( "off-heap - allocated: \t%1s", Ram.inMb( mem.capacity() ) ) );
+ logger.info( format( "off-heap - used: \t%1s", Ram.inMb( mem.used() ) ) );
+ logger.info( format( "heap - max: \t%1s", Ram.inMb( Runtime.getRuntime().maxMemory() ) ) );
+ logger.info( format( "heap - allocated: \t%1s", Ram.inMb( Runtime.getRuntime().totalMemory() ) ) );
+ logger.info( format( "heap - free : \t%1s", Ram.inMb( Runtime.getRuntime().freeMemory() ) ) );
logger.info( "************************************************" );
}
Modified: incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/Monitor.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/Monitor.java?rev=1244473&r1=1244472&r2=1244473&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/Monitor.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/Monitor.java Wed Feb 15 13:10:06 2012
@@ -19,14 +19,15 @@ package org.apache.directmemory.measures
* under the License.
*/
-import org.apache.directmemory.misc.Format;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static java.lang.String.format;
import java.text.DecimalFormat;
import java.util.HashMap;
import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public class Monitor
{
@@ -93,11 +94,10 @@ public class Monitor
public String toString()
{
- return Format.it( "%1$s hits: %2$d, avg: %3$s ms, tot: %4$s seconds", monitorService.getName(),
- monitorService.getHits().get(),
- new DecimalFormat( "####.###" ).format( (double) average() / 1000000 ),
- new DecimalFormat( "####.###" ).format(
- (double) monitorService.getTotalTime() / 1000000000 ) );
+ return format( "%1$s hits: %2$d, avg: %3$s ms, tot: %4$s seconds", monitorService.getName(),
+ monitorService.getHits().get(),
+ new DecimalFormat( "####.###" ).format( (double) average() / 1000000 ),
+ new DecimalFormat( "####.###" ).format( (double) monitorService.getTotalTime() / 1000000000 ) );
}
public static void dump( String prefix )
Modified: incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/MonitorServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/MonitorServiceImpl.java?rev=1244473&r1=1244472&r2=1244473&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/MonitorServiceImpl.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/measures/MonitorServiceImpl.java Wed Feb 15 13:10:06 2012
@@ -19,16 +19,16 @@ package org.apache.directmemory.measures
* under the License.
*/
-
-import org.apache.directmemory.misc.Format;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import static java.lang.String.format;
import java.text.DecimalFormat;
import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.atomic.AtomicLong;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
public class MonitorServiceImpl
implements MonitorService
{
@@ -92,9 +92,9 @@ public class MonitorServiceImpl
public String toString()
{
- return Format.it( "%1$s hits: %2$d, avg: %3$s ms, tot: %4$s seconds", name, hits.get(),
- new DecimalFormat( "####.###" ).format( (double) average() / 1000000 ),
- new DecimalFormat( "####.###" ).format( (double) totalTime / 1000000000 ) );
+ return format( "%1$s hits: %2$d, avg: %3$s ms, tot: %4$s seconds", name, hits.get(),
+ new DecimalFormat( "####.###" ).format( (double) average() / 1000000 ),
+ new DecimalFormat( "####.###" ).format( (double) totalTime / 1000000000 ) );
}
public void dump( String prefix )
Modified: incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java?rev=1244473&r1=1244472&r2=1244473&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/MemoryManagerServiceImpl.java Wed Feb 15 13:10:06 2012
@@ -19,10 +19,12 @@ package org.apache.directmemory.memory;
* under the License.
*/
+import static java.lang.String.format;
+
import java.util.ArrayList;
import java.util.List;
+
import org.apache.directmemory.measures.Ram;
-import org.apache.directmemory.misc.Format;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,7 +52,7 @@ public class MemoryManagerServiceImpl
buffers.add( offHeapMemoryBuffer );
}
- logger.info( Format.it( "MemoryManager initialized - %d buffers, %s each", numberOfBuffers, Ram.inMb( size ) ) );
+ logger.info( format( "MemoryManager initialized - %d buffers, %s each", numberOfBuffers, Ram.inMb( size ) ) );
}
protected OffHeapMemoryBuffer instanciateOffHeapMemoryBuffer( int size, int bufferNumber )
Modified: incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMemoryBufferImpl.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMemoryBufferImpl.java?rev=1244473&r1=1244472&r2=1244473&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMemoryBufferImpl.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMemoryBufferImpl.java Wed Feb 15 13:10:06 2012
@@ -19,6 +19,8 @@ package org.apache.directmemory.memory;
* under the License.
*/
+import static java.lang.String.format;
+
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
@@ -28,7 +30,6 @@ import java.util.zip.CRC32;
import java.util.zip.Checksum;
import org.apache.directmemory.measures.Ram;
-import org.apache.directmemory.misc.Format;
import org.josql.Query;
import org.josql.QueryExecutionException;
import org.josql.QueryParseException;
@@ -61,8 +62,8 @@ public class OffHeapMemoryBufferImpl
public static OffHeapMemoryBufferImpl createNew( int capacity, int bufferNumber )
{
- logger.info( Format.it( "Creating OffHeapMemoryBuffer %d with a capacity of %s", bufferNumber,
- Ram.inMb( capacity ) ) );
+ logger.info( format( "Creating OffHeapMemoryBuffer %d with a capacity of %s",
+ bufferNumber, Ram.inMb( capacity ) ) );
return new OffHeapMemoryBufferImpl( ByteBuffer.allocateDirect( capacity ), bufferNumber );
}
@@ -258,7 +259,7 @@ public class OffHeapMemoryBufferImpl
return howMuch;
}
- // TODO : This function should be put in an Util class.
+ // TODO : This function should be put in an Util class.
public static long crc32( byte[] payload )
{
final Checksum checksum = new CRC32();
Modified: incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMergingMemoryBufferImpl.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMergingMemoryBufferImpl.java?rev=1244473&r1=1244472&r2=1244473&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMergingMemoryBufferImpl.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/memory/OffHeapMergingMemoryBufferImpl.java Wed Feb 15 13:10:06 2012
@@ -19,6 +19,8 @@ package org.apache.directmemory.memory;
* under the License.
*/
+import static java.lang.String.format;
+
import java.nio.BufferOverflowException;
import java.nio.ByteBuffer;
import java.util.ArrayList;
@@ -34,31 +36,30 @@ import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import org.apache.directmemory.measures.Ram;
-import org.apache.directmemory.misc.Format;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* {@link OffHeapMemoryBuffer} implementation that internally user 3 data structures to
* store the pointers :
- *
+ *
* - 1 sorted list backed by a ({@link TreeMap}) that store the free pointers sorted
* by size desc, used to allocate memory efficiently : if the first pointer has
* not enough capacity, then no other pointers will.
- *
+ *
* - 1 sorted list backed by a ({@link TreeMap}) that store the free pointers sorted
* by address offset, used to merge freed pointer efficiently : when freeing a
* pointer, direct lookup and navigation in this list will find adjacent
* pointers
- *
+ *
* - 1 set backed by ({@link ConcurrentHashMap}) of used pointers, to not loose a
* reference to a pointer, and to be able to the buffer and stay in a consistent
* state
- *
+ *
* {@link TreeMap} can be safely used because synchronization is achieved through a {@link Lock}
- *
+ *
* @author bperroud
- *
+ *
*/
public class OffHeapMergingMemoryBufferImpl
extends AbstractOffHeapMemoryBuffer
@@ -96,8 +97,8 @@ public class OffHeapMergingMemoryBufferI
*/
public static OffHeapMergingMemoryBufferImpl createNew( int capacity, int bufferNumber )
{
- logger.info( Format.it( "Creating OffHeapLinkedMemoryBuffer %d with a capacity of %s", bufferNumber,
- Ram.inMb( capacity ) ) );
+ logger.info( format( "Creating OffHeapLinkedMemoryBuffer %d with a capacity of %s",
+ bufferNumber, Ram.inMb( capacity ) ) );
return new OffHeapMergingMemoryBufferImpl( ByteBuffer.allocateDirect( capacity ), bufferNumber );
}
@@ -191,7 +192,7 @@ public class OffHeapMergingMemoryBufferI
Pointer lowerPointerToMerge = pointer2free;
- // search for adjacent pointers lower than the current one
+ // search for adjacent pointers lower than the current one
for ( Pointer adjacentPointer : freePointersByMemoryOffsetAsc.headMap( pointer2free, false )
.descendingKeySet() )
{
@@ -328,7 +329,7 @@ public class OffHeapMergingMemoryBufferI
if ( goodOne == null )
{
allocationErrors++;
- return null; // not enough space on this buffer.
+ return null; // not enough space on this buffer.
}
// Remove good pointer because it's size and offset will change.
@@ -346,7 +347,7 @@ public class OffHeapMergingMemoryBufferI
fresh.free = true;
fresh.created = System.currentTimeMillis();
- // create a new pointer for the remaining space
+ // create a new pointer for the remaining space
final Pointer newGoodOne = new Pointer( fresh.end + 1, goodOne.end );
newGoodOne.free = true;
Modified: incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/misc/Format.java
URL: http://svn.apache.org/viewvc/incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/misc/Format.java?rev=1244473&r1=1244472&r2=1244473&view=diff
==============================================================================
--- incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/misc/Format.java (original)
+++ incubator/directmemory/trunk/directmemory-cache/src/main/java/org/apache/directmemory/misc/Format.java Wed Feb 15 13:10:06 2012
@@ -22,12 +22,6 @@ package org.apache.directmemory.misc;
public class Format
{
- public static String it( String string, Object... args )
- {
- java.util.Formatter formatter = new java.util.Formatter();
- return formatter.format( string, args ).toString();
- }
-
public static String logo()
{
return " ____ _ __ __ ___\r\n"