[Mulgara-svn] r873 - projects/xa2/object-pool/src/scheduler

[andrae at mulgara.org]

Author: andrae
Date: 2008-04-30 21:55:48 -0700 (Wed, 30 Apr 2008)
New Revision: 873

Modified:
   projects/xa2/object-pool/src/scheduler/Block.java
   projects/xa2/object-pool/src/scheduler/FileCache.java
   projects/xa2/object-pool/src/scheduler/FileHandle.java
   projects/xa2/object-pool/src/scheduler/IOScheduler.java
Log:
Need to rename FileCache to BlockCache.



Modified: projects/xa2/object-pool/src/scheduler/Block.java
===================================================================
--- projects/xa2/object-pool/src/scheduler/Block.java	2008-05-01 04:45:55 UTC (rev 872)
+++ projects/xa2/object-pool/src/scheduler/Block.java	2008-05-01 04:55:48 UTC (rev 873)
@@ -5,10 +5,6 @@
  */
 package scheduler;
 
-import java.lang.ref.SoftReference;
-import java.util.HashMap;
-import java.util.Map;
-
 public class Block {
   private FileHandle handle;
   private Long position;

Modified: projects/xa2/object-pool/src/scheduler/FileCache.java
===================================================================
--- projects/xa2/object-pool/src/scheduler/FileCache.java	2008-05-01 04:45:55 UTC (rev 872)
+++ projects/xa2/object-pool/src/scheduler/FileCache.java	2008-05-01 04:55:48 UTC (rev 873)
@@ -9,22 +9,18 @@
 import java.ref.SoftReference;
 import java.util.WeakHashMap;
 
-public class FileCache {
+public class BlockCache {
   private FileHandle handle;
   // The Block object is required to maintain a strong reference to the Long key obj.
   private WeakHashMap<Long, SoftReference<Block>> blockCache;
 
   private static final int LOG2_BLOCK_SIZE = 21;
 
-  FileCache(FileHandle handle) {
+  BlockCache(FileHandle handle) {
     this.handle = handle;
-    this.blockCache = new WeakHashMap
+    this.blockCache = new WeakHashMap<Long, SoftReference<Block>>();
   }
 
-  public File getFile() {
-    return file;
-  }
-
   public Block getBlock(long position) {
     Long pos = new Long(position >> handle.log2BlockSize());
     SoftReference<Block> blockRef = blockCache.get(pos);

Modified: projects/xa2/object-pool/src/scheduler/FileHandle.java
===================================================================
--- projects/xa2/object-pool/src/scheduler/FileHandle.java	2008-05-01 04:45:55 UTC (rev 872)
+++ projects/xa2/object-pool/src/scheduler/FileHandle.java	2008-05-01 04:55:48 UTC (rev 873)
@@ -34,7 +34,5 @@
       seeks++;
       channel.position(position);
     }
-
-
   }
 }

Modified: projects/xa2/object-pool/src/scheduler/IOScheduler.java
===================================================================
--- projects/xa2/object-pool/src/scheduler/IOScheduler.java	2008-05-01 04:45:55 UTC (rev 872)
+++ projects/xa2/object-pool/src/scheduler/IOScheduler.java	2008-05-01 04:55:48 UTC (rev 873)
@@ -11,8 +11,10 @@
 
 public class IOScheduler {
   private Map<FileHandle, FileCache> fileCache;
+  private File[] disks;
 
-  public IOScheduler() {
+  public IOScheduler(File[] disks) {
+    this.disks = disks;
     fileCache = new HashMap<FileHandle, FileCache>();
   }
 }