Adding effectiveAverageMessageRate

src/main/java/me/scai/utilities/WorkerPool.java

@@ -48,6 +48,16 @@ public interface WorkerPool {
      */
     public float getCurrentAverageMessageRate(String workerId);
 
+    /* Get the current average message rate, defined as n_M / (t - t0)
+     *     where in n_M is the current total number of messages, t is the current time,
+     *     and t0 is the time of worker registration
+     *
+     * @param    worker ID
+     * @return   current average message rate (s ^ -1)
+     * @throws   IllegalArgumentException on invalid worker ID
+     */
+    public float getEffectiveAverageMessageRate(String workerId);
+
     /* Clear all workers in the pool */
     public void clearWorkers();
 

src/main/java/me/scai/utilities/WorkerPoolImpl.java

@@ -253,4 +253,17 @@ public synchronized float getCurrentAverageMessageRate(String workerId) {
         return ((float) workerMessageCounts.get(workerId)) / ((float) (t - t0)) / 1000.0f;
     }
 
+
+    @Override
+    public synchronized float getEffectiveAverageMessageRate(String workerId) {
+        if (!workerMessageCounts.containsKey(workerId)) {
+            throw new IllegalArgumentException("Invalid worker ID: \"" + workerId + "\"");
+        }
+
+        final long t1 = getLastUseTimestamp(workerId).getTime();
+        final long t0 = workerCreatedTimestamps.get(workerId).getTime();
+
+        return ((float) workerMessageCounts.get(workerId)) / ((float) (t1 - t0)) / 1000.0f;
+    }
+
 }

src/test/java/me/scai/utilities/TestWorkerPool.java

@@ -53,7 +53,7 @@ public void testInvalidWorkerId() {
         /* Make sure that the right types of exceptions are thrown under invalid worker ID arguments */
         invalidWorkerIdExceptionThrown = false;
         try {
-            PoolWorker pw = wp.getWorker(fakeWorkerId):
+            PooledWorker pw = wp.getWorker(fakeWorkerId);
         } catch (IllegalArgumentException exc) {
             invalidWorkerIdExceptionThrown = true;
         }
@@ -83,6 +83,14 @@ public void testInvalidWorkerId() {
         }
         assertTrue(invalidWorkerIdExceptionThrown);
 
+        invalidWorkerIdExceptionThrown = false;
+        try {
+            float emr = wp.getEffectiveAverageMessageRate(fakeWorkerId);
+        } catch (IllegalArgumentException exc) {
+            invalidWorkerIdExceptionThrown = true;
+        }
+        assertTrue(invalidWorkerIdExceptionThrown);
+
 
     }
 
@@ -113,6 +121,7 @@ public void testWorkerPool() throws InterruptedException {
         }
 
         assertTrue(wp.getCurrentAverageMessageRate(wkrId) > 0.0f);
+        assertTrue(wp.getEffectiveAverageMessageRate(wkrId) > 0.0f);
 
         /* Wait for a period of time that shouldn't lead to expiration */
         Thread.sleep(workerTimeout / 2);