[jboss-cvs] jboss-jms/src/main/org/jboss/messaging/core/local ...
Timothy Fox
tim.fox at jboss.com
Mon Jul 17 13:14:47 EDT 2006
User: timfox
Date: 06/07/17 13:14:47
Modified: src/main/org/jboss/messaging/core/local
CoreSubscription.java Pipe.java Queue.java
Log:
Many changes including implementation of prefetch, SEDAisation of server, changing of recovery
Revision Changes Path
1.10 +7 -9 jboss-jms/src/main/org/jboss/messaging/core/local/CoreSubscription.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CoreSubscription.java
===================================================================
RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/messaging/core/local/CoreSubscription.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- CoreSubscription.java 27 Jun 2006 19:44:40 -0000 1.9
+++ CoreSubscription.java 17 Jul 2006 17:14:47 -0000 1.10
@@ -31,12 +31,14 @@
import org.jboss.messaging.core.plugin.contract.PersistenceManager;
import org.jboss.messaging.core.tx.Transaction;
+import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
+
/**
* Represents a subscription to a destination (topic or queue).
*
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
*
- * $Id: CoreSubscription.java,v 1.9 2006/06/27 19:44:40 timfox Exp $
+ * $Id: CoreSubscription.java,v 1.10 2006/07/17 17:14:47 timfox Exp $
*/
public class CoreSubscription extends Pipe
{
@@ -66,11 +68,12 @@
public CoreSubscription(long id, Topic topic,
MessageStore ms, PersistenceManager pm, MemoryManager mm,
boolean recoverable,
- int fullSize, int pageSize, int downCacheSize, Filter filter)
+ int fullSize, int pageSize, int downCacheSize,
+ QueuedExecutor executor, Filter filter)
{
// A CoreSubscription must accept reliable messages
- super(id, ms, pm, mm, true, recoverable, fullSize, pageSize, downCacheSize);
+ super(id, ms, pm, mm, true, recoverable, fullSize, pageSize, downCacheSize, executor);
this.topic = topic;
this.filter = filter;
}
@@ -115,11 +118,6 @@
return topic;
}
- public void load() throws Exception
- {
- state.load();
- }
-
public String toString()
{
return "CoreSubscription[" + getChannelID() + ", " + topic + "]";
1.15 +6 -4 jboss-jms/src/main/org/jboss/messaging/core/local/Pipe.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Pipe.java
===================================================================
RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/messaging/core/local/Pipe.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- Pipe.java 27 Jun 2006 19:44:40 -0000 1.14
+++ Pipe.java 17 Jul 2006 17:14:47 -0000 1.15
@@ -26,11 +26,13 @@
import org.jboss.messaging.core.plugin.contract.MessageStore;
import org.jboss.messaging.core.plugin.contract.PersistenceManager;
+import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
+
/**
* @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @version <tt>$Revision: 1.14 $</tt>
- * $Id: Pipe.java,v 1.14 2006/06/27 19:44:40 timfox Exp $
+ * @version <tt>$Revision: 1.15 $</tt>
+ * $Id: Pipe.java,v 1.15 2006/07/17 17:14:47 timfox Exp $
*/
public class Pipe extends ChannelSupport
{
@@ -44,9 +46,9 @@
public Pipe(long id, MessageStore ms, PersistenceManager pm, MemoryManager mm,
boolean acceptReliableMessages, boolean recoverable,
- int fullSize, int pageSize, int downCacheSize)
+ int fullSize, int pageSize, int downCacheSize, QueuedExecutor executor)
{
- super(id, ms, pm, mm, acceptReliableMessages, recoverable, fullSize, pageSize, downCacheSize);
+ super(id, ms, pm, mm, acceptReliableMessages, recoverable, fullSize, pageSize, downCacheSize, executor);
router = new SingleDestinationRouter();
}
1.33 +8 -10 jboss-jms/src/main/org/jboss/messaging/core/local/Queue.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Queue.java
===================================================================
RCS file: /cvsroot/jboss/jboss-jms/src/main/org/jboss/messaging/core/local/Queue.java,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- Queue.java 27 Jun 2006 19:44:40 -0000 1.32
+++ Queue.java 17 Jul 2006 17:14:47 -0000 1.33
@@ -26,12 +26,14 @@
import org.jboss.messaging.core.plugin.contract.MessageStore;
import org.jboss.messaging.core.plugin.contract.PersistenceManager;
+import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
+
/**
* @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
* @author <a href="mailto:tim.fox"jboss.com">Tim Fox</a>
- * @version <tt>$Revision: 1.32 $</tt>
+ * @version <tt>$Revision: 1.33 $</tt>
*
- * $Id: Queue.java,v 1.32 2006/06/27 19:44:40 timfox Exp $
+ * $Id: Queue.java,v 1.33 2006/07/17 17:14:47 timfox Exp $
*/
public class Queue extends ChannelSupport implements CoreDestination
{
@@ -52,9 +54,10 @@
// Constructors --------------------------------------------------
public Queue(long id, MessageStore ms, PersistenceManager pm, MemoryManager mm,
- boolean recoverable, int fullSize, int pageSize, int downCacheSize)
+ boolean recoverable, int fullSize, int pageSize, int downCacheSize,
+ QueuedExecutor executor)
{
- super(id, ms, pm, mm, true, recoverable, fullSize, pageSize, downCacheSize);
+ super(id, ms, pm, mm, true, recoverable, fullSize, pageSize, downCacheSize, executor);
router = new PointToPointRouter();
this.fullSize = fullSize;
this.pageSize = pageSize;
@@ -68,11 +71,6 @@
return "CoreQueue[" + getChannelID() + "]";
}
- public void load() throws Exception
- {
- state.load();
- }
-
public boolean isQueue()
{
return true;
@@ -80,7 +78,7 @@
public int getMessageCount()
{
- return state.messageCount();
+ return messageCount();
}
// CoreDestination implementation -------------------------------
More information about the jboss-cvs-commits
mailing list