check cb->stop in the while loop

Checking dc->stop in the while condition and again after the while loop costs some CPU cycles we should save. git-svn-id: https://svn.musicpd.org/mpd/trunk@7340 09075e82-0dd4-0310-85a5-a0d7c8717e4f

check cb->stop in the while loop
bc7e60cb · Max Kellermann · Eric Wong · f0e78138 · bc7e60cb
Commit bc7e60cb authored Apr 12, 2008 by Max Kellermann Committed by Eric Wong Apr 12, 2008
Show whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

outputBuffer.c src/outputBuffer.c +4 -4

No files found.
--- a/src/outputBuffer.c
+++ b/src/outputBuffer.c
@@ -161,10 +161,13 @@ static int tailChunk(OutputBuffer * cb, InputStream * inStream,
 	if (chunk->chunkSize == sizeof(chunk->data)) {
 		/* this chunk is full; allocate a new chunk */
 		next = successor(cb, cb->end);
-		while (cb->begin == next && !dc->stop) {
+		while (cb->begin == next) {
 			/* all chunks are full of decoded data; wait
 			   for the player to free one */

+			if (dc->stop)
+				return OUTPUT_BUFFER_DC_STOP;
+
 			if (dc->seek) {
 				if (seekable) {
 					return OUTPUT_BUFFER_DC_SEEK;
@@ -180,9 +183,6 @@ static int tailChunk(OutputBuffer * cb, InputStream * inStream,
 			}
 		}

-		if (dc->stop)
-			return OUTPUT_BUFFER_DC_STOP;
-
 		output_buffer_expand(cb, next);
 		chunk = outputBufferGetChunk(cb, next);
 		assert(chunk->chunkSize == 0);