[Red5commits] [2442] Added a shutdown to bw controler

[pgregoire]

Added a shutdown to bw controler


Timestamp: 10/25/07 16:56:30 EST (5 days ago) 
Change: 2442 
Author: pgregoire

Files (see diff or trac for details): 
java/server/trunk/conf/red5-common.xml
java/server/trunk/conf/war/red5-common.xml
java/server/trunk/src/org/red5/server/stream/PlaylistSubscriberStream.java
java/server/trunk/src/org/red5/server/stream/SimpleBWControlService.java
java/server/trunk/src/org/red5/server/stream/filter/StreamBandwidthController.java


Trac: http://mirror1.cvsdude.com/trac/osflash/red5/changeset/2442

Index: /java/server/trunk/conf/red5-common.xml
===================================================================
--- /java/server/trunk/conf/red5-common.xml (revision 2435)
+++ /java/server/trunk/conf/red5-common.xml (revision 2442)
@@ -97,5 +97,5 @@
 	<bean id="consumerService" class="org.red5.server.stream.ConsumerService"/>
 	<!-- Simple bandwidth control -->
-	<bean id="BWControlService" class="org.red5.server.stream.SimpleBWControlService" init-method="init">
+	<bean id="BWControlService" class="org.red5.server.stream.SimpleBWControlService" init-method="init" destroy-method="shutdown">
 		<property name="interval" value="100"/>
 		<property name="defaultCapacity" value="104857600"/>
Index: /java/server/trunk/conf/war/red5-common.xml
===================================================================
--- /java/server/trunk/conf/war/red5-common.xml (revision 2435)
+++ /java/server/trunk/conf/war/red5-common.xml (revision 2442)
@@ -93,5 +93,5 @@
 	<bean id="consumerService" class="org.red5.server.stream.ConsumerService"/>
 	<!-- Simple bandwidth control -->
-	<bean id="BWControlService" class="org.red5.server.stream.SimpleBWControlService" init-method="init">
+	<bean id="BWControlService" class="org.red5.server.stream.SimpleBWControlService" init-method="init" destroy-method="shutdown">
 		<property name="interval" value="100"/>
 		<property name="defaultCapacity" value="104857600"/>
Index: /java/server/trunk/src/org/red5/server/stream/SimpleBWControlService.java
===================================================================
--- /java/server/trunk/src/org/red5/server/stream/SimpleBWControlService.java (revision 2397)
+++ /java/server/trunk/src/org/red5/server/stream/SimpleBWControlService.java (revision 2442)
@@ -70,4 +70,8 @@
 	}
 
+	public void shutdown() {
+		tokenDistributor.cancel();
+	}
+	
 	public void run() {
 		if (contextMap.isEmpty()) {
Index: /java/server/trunk/src/org/red5/server/stream/PlaylistSubscriberStream.java
===================================================================
--- /java/server/trunk/src/org/red5/server/stream/PlaylistSubscriberStream.java (revision 2397)
+++ /java/server/trunk/src/org/red5/server/stream/PlaylistSubscriberStream.java (revision 2442)
@@ -296,4 +296,6 @@
 		try {
 			engine.stop();
+			//clean up the executor
+			executor.shutdown();
 		} catch (IllegalStateException e) {
 			log.debug("stop caught an IllegalStateException");
Index: /java/server/trunk/src/org/red5/server/stream/filter/StreamBandwidthController.java
===================================================================
--- /java/server/trunk/src/org/red5/server/stream/filter/StreamBandwidthController.java (revision 2397)
+++ /java/server/trunk/src/org/red5/server/stream/filter/StreamBandwidthController.java (revision 2442)
@@ -128,5 +128,5 @@
      * Start puller thread
      */
-    private synchronized void startThread() {
+    private void startThread() {
 		if (!isStarted && providerPipe != null && consumerPipe != null) {
 			puller = new Thread(this);


Note:
Diffs are chopped if more than 25k.
This is to get past the limit on the mailing list.