Revision: 679b3c6121d6
Author: unknown <yulian@Venera.(none)>
Date: Sun Nov 25 14:18:52 2012
Log: Modified scheduler queues order
http://code.google.com/p/mediaserver/source/detail?r=679b3c6121d6
Modified:
/client/jsr-309/tck/media/decreasingvolume-recorded.wav
/client/jsr-309/tck/media/increasingvolume-recorded.wav
/client/jsr-309/tck/server.log
/media-server-docs/sources-mobicents/src/main/resources/META-INF/MANIFEST.MF
/media-server-docs/sources-mobicents/src/main/resources/META-INF/maven/org.mobicents.media.docs/mobicents-mms-docs-sources/pom.properties
/scheduler/src/main/java/org/mobicents/media/server/scheduler/Scheduler.java
=======================================
--- /client/jsr-309/tck/media/decreasingvolume-recorded.wav Tue Nov 6
04:41:55 2012
+++ /client/jsr-309/tck/media/decreasingvolume-recorded.wav Sun Nov 25
14:18:52 2012
Binary file, no diff available.
=======================================
--- /client/jsr-309/tck/media/increasingvolume-recorded.wav Thu Nov 8
14:38:44 2012
+++ /client/jsr-309/tck/media/increasingvolume-recorded.wav Sun Nov 25
14:18:52 2012
Binary file, no diff available.
=======================================
--- /client/jsr-309/tck/server.log Thu Nov 8 14:38:44 2012
+++ /client/jsr-309/tck/server.log Sun Nov 25 14:18:52 2012
@@ -1,6 +1,6 @@
-2012-11-09 00:10:24,463 DEBUG [TestBase] (main) Loading
file:/opt/mobsource/medianew/client/jsr-309/tck/exclude-list.properties
-2012-11-09 00:10:24,465 INFO [Runner] (main) Start
mandatory.functional.mediagroup.PlayerTest.test_2_1_1_1_Play
javadoc::Joinable::1 javadoc::MediaGroup::1 javadoc::MediaGroup::6
javadoc::Player::1 javadoc::PlayerEvent::15
-2012-11-09 00:10:24,465 DEBUG [TestBase] (main) Getting a MsControlFactory
instance
-2012-11-09 00:10:24,488 INFO [DriverImpl] (main) Initializing MGCP on
/127.0.0.1:2729
-2012-11-09 00:10:24,501 WARN [JainMgcpStackImpl] (main) Failed to locate
properties file, using default values
-2012-11-09 00:10:24,511 INFO [JainMgcpStackImpl] (main) Jain Mgcp stack
bound to IP /127.0.0.1 and UDP port 2729
+2012-11-25 22:18:36,732 DEBUG [TestBase] (main) Loading
file:/opt/mobsource/medianew/client/jsr-309/tck/exclude-list.properties
+2012-11-25 22:18:36,741 INFO [Runner] (main) Start
mandatory.functional.mediagroup.PlayerTest.test_2_1_1_1_Play
javadoc::Joinable::1 javadoc::MediaGroup::1 javadoc::MediaGroup::6
javadoc::Player::1 javadoc::PlayerEvent::15
+2012-11-25 22:18:36,741 DEBUG [TestBase] (main) Getting a MsControlFactory
instance
+2012-11-25 22:18:36,763 INFO [DriverImpl] (main) Initializing MGCP on
/127.0.0.1:2729
+2012-11-25 22:18:36,776 WARN [JainMgcpStackImpl] (main) Failed to locate
properties file, using default values
+2012-11-25 22:18:36,786 INFO [JainMgcpStackImpl] (main) Jain Mgcp stack
bound to IP /127.0.0.1 and UDP port 2729
=======================================
---
/media-server-docs/sources-mobicents/src/main/resources/META-INF/MANIFEST.MF
Thu Nov 8 14:38:44 2012
+++
/media-server-docs/sources-mobicents/src/main/resources/META-INF/MANIFEST.MF
Sun Nov 25 14:18:52 2012
@@ -13,7 +13,7 @@
Bundle-Vendor: TeleStax, Inc.
Implementation-Vendor-Id: TeleStax, Inc.
Bundle-Version: 3.0.0.FINAL
-Bnd-LastModified: 1352411903866
+Bnd-LastModified: 1353873888039
Bundle-ManifestVersion: 2
Bundle-License: http://www.gnu.org/licenses/lgpl-2.1.html
Bundle-Description: Mobicents :: Parent pom for 2.x releases
=======================================
---
/media-server-docs/sources-mobicents/src/main/resources/META-INF/maven/org.mobicents.media.docs/mobicents-mms-docs-sources/pom.properties
Thu Nov 8 14:38:44 2012
+++
/media-server-docs/sources-mobicents/src/main/resources/META-INF/maven/org.mobicents.media.docs/mobicents-mms-docs-sources/pom.properties
Sun Nov 25 14:18:52 2012
@@ -1,5 +1,5 @@
#Generated by Maven
-#Thu Nov 08 23:58:23 IST 2012
+#Sun Nov 25 22:04:48 IST 2012
version=3.0.0.FINAL
groupId=org.mobicents.media.docs
artifactId=mobicents-mms-docs-sources
=======================================
---
/scheduler/src/main/java/org/mobicents/media/server/scheduler/Scheduler.java
Sat Oct 27 14:57:25 2012
+++
/scheduler/src/main/java/org/mobicents/media/server/scheduler/Scheduler.java
Sun Nov 25 14:18:52 2012
@@ -266,7 +266,7 @@
while(active)
{
- currQueue=UDP_MANAGER_QUEUE;
+ currQueue=MANAGEMENT_QUEUE;
while(currQueue<=OUTPUT_QUEUE)
{
synchronized(LOCK) {
@@ -281,6 +281,16 @@
currQueue++;
}
+
+ synchronized(LOCK) {
+
if(executeQueue(taskQueues[MANAGEMENT_QUEUE]))
+ try {
+ LOCK.wait();
+ }
+ catch(InterruptedException e) {
+ //lets continue
+ }
+ }
runIndex=(runIndex+1)%5;
if(runIndex==0)
@@ -294,7 +304,17 @@
}
}
- //sleep till next cycle
+ synchronized(LOCK) {
+
if(executeQueue(taskQueues[MANAGEMENT_QUEUE]))
+ try {
+ LOCK.wait();
+ }
+ catch(InterruptedException e) {
+ //lets continue
+ }
+ }
+
+ //sleep till next cycle
cycleDuration=clock.getTime() - cycleStart;
if(cycleDuration<20000000L)
try {
@@ -382,16 +402,6 @@
try {
LOCK.wait();
}
- catch(InterruptedException e) {
- //lets continue
- }
- }
-
- synchronized(LOCK) {
-
if(executeQueue(taskQueues[MANAGEMENT_QUEUE]))
- try {
- LOCK.wait();
- }
catch(InterruptedException e) {
//lets continue
}
