From: Jeremy Kerr Date: Wed, 15 Oct 2008 02:20:42 +0000 (+1100) Subject: powerpc/spufs: sputrace: Don't block until the read buffer is full X-Git-Tag: v2.6.28-rc1~58^2~36 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e869446bb6db209e6092f7cba6cdfc2a5e637177;p=linux-2.6-omap-h63xx.git powerpc/spufs: sputrace: Don't block until the read buffer is full Currently, read() on the sputrace buffer will only return data when the user buffer is exhausted. This may mean that we never see the end of the event log, unless we read() with exactly the right-sized buffer. This change makes sputrace_read not block if we have data ready to return. Signed-off-by: Jeremy Kerr --- diff --git a/arch/powerpc/platforms/cell/spufs/sputrace.c b/arch/powerpc/platforms/cell/spufs/sputrace.c index 50cae0cf098..a2460e2e192 100644 --- a/arch/powerpc/platforms/cell/spufs/sputrace.c +++ b/arch/powerpc/platforms/cell/spufs/sputrace.c @@ -80,6 +80,11 @@ static ssize_t sputrace_read(struct file *file, char __user *buf, char tbuf[128]; int width; + /* If we have data ready to return, don't block waiting + * for more */ + if (cnt > 0 && sputrace_used() == 0) + break; + error = wait_event_interruptible(sputrace_wait, sputrace_used() > 0); if (error)