[Slim-Checkins] r9239 - in /trunk/server/Slim: Control/Request.pm Schema/Playlist.pm Utils/UPnPMediaServer.pm

[adrian at svn.slimdevices.com]

Author: adrian
Date: Tue Aug 29 10:01:00 2006
New Revision: 9239

URL: http://svn.slimdevices.com?rev=9239&view=rev
Log:
Bug: N/A
Description:
- add idleStreams during playlist update as can take
serveral seconds for long playlists
- tidy up old idleStream calls + perfmon message

Modified:
    trunk/server/Slim/Control/Request.pm
    trunk/server/Slim/Schema/Playlist.pm
    trunk/server/Slim/Utils/UPnPMediaServer.pm

Modified: trunk/server/Slim/Control/Request.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Control/Request.pm?rev=9239&r1=9238&r2=9239&view=diff
==============================================================================
--- trunk/server/Slim/Control/Request.pm (original)
+++ trunk/server/Slim/Control/Request.pm Tue Aug 29 10:01:00 2006
@@ -1435,7 +1435,7 @@
 	# contine execution unless the Request is still work in progress (async)...
 	$self->executeDone() unless $self->isStatusProcessing();
 
-	$::perfmon && $now && $requestTask->log(Time::HiRes::time() - $now) && msg("    Execute: $funcName\n");
+	$::perfmon && $now && $requestTask->log(Time::HiRes::time() - $now) && msg("    Execute: $funcName\n", undef, 1);
 }
 
 # perform end of execution, calling the callback etc...

Modified: trunk/server/Slim/Schema/Playlist.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Schema/Playlist.pm?rev=9239&r1=9238&r2=9239&view=diff
==============================================================================
--- trunk/server/Slim/Schema/Playlist.pm (original)
+++ trunk/server/Slim/Schema/Playlist.pm Tue Aug 29 10:01:00 2006
@@ -101,6 +101,9 @@
 				position => $position++
 			});
 		}
+
+		# updating playlist can take several seconds - maintain streaming 
+		main::idleStreams();
 	}
 }
 

Modified: trunk/server/Slim/Utils/UPnPMediaServer.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Utils/UPnPMediaServer.pm?rev=9239&r1=9238&r2=9239&view=diff
==============================================================================
--- trunk/server/Slim/Utils/UPnPMediaServer.pm (original)
+++ trunk/server/Slim/Utils/UPnPMediaServer.pm Tue Aug 29 10:01:00 2006
@@ -199,7 +199,7 @@
 		while ( my $chunk = <$io> ) {
 			
 			# This can be slow if we have a huge file to process, so give back some time
-			main::idleStreams( 0, 1 );
+			main::idleStreams();
 			
 			if ( $chunk =~ /<container(.*?)<\/container>/sg ) {
 				my $node = $1;
@@ -241,7 +241,7 @@
 					while ( my $itemChunk = <$io> ) {
 						
 						# This can be slow if we have a huge file to process, so give back some time
-						main::idleStreams( 0, 1 );
+						main::idleStreams();
 						
 						if ( $itemChunk =~ /<item(.*?)<\/item>/sg ) {
 							my $node = $1;
@@ -383,4 +383,4 @@
 	$callback->( $container, @{$passthrough} );
 }
 
-1;
+1;