| Message ID | 1350578453-24368-1-git-send-email-peter.maydell@linaro.org |
|---|---|
| State | New |
| Headers | show |
Am 18.10.2012 18:40, schrieb Peter Maydell: > Fix some minor typos/grammar errors in comments. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > v1->v2: reinstated carelessly dropped 'if', noted by Stefan Weil. > > ui/vnc-jobs.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c > index 087b84d..3c592b3 100644 > --- a/ui/vnc-jobs.c > +++ b/ui/vnc-jobs.c > @@ -33,21 +33,21 @@ > /* > * Locking: > * > - * There is three levels of locking: > + * There are three levels of locking: > * - jobs queue lock: for each operation on the queue (push, pop, isEmpty?) > * - VncDisplay global lock: mainly used for framebuffer updates to avoid > * screen corruption if the framebuffer is updated > - * while the worker is doing something. > + * while the worker is doing something. > * - VncState::output lock: used to make sure the output buffer is not corrupted > - * if two threads try to write on it at the same time > + * if two threads try to write on it at the same time > * > - * While the VNC worker thread is working, the VncDisplay global lock is hold > - * to avoid screen corruptions (this does not block vnc_refresh() because it > - * uses trylock()) but the output lock is not hold because the thread work on > + * While the VNC worker thread is working, the VncDisplay global lock is held > + * to avoid screen corruption (this does not block vnc_refresh() because it > + * uses trylock()) but the output lock is not held because the thread works on > * its own output buffer. > * When the encoding job is done, the worker thread will hold the output lock > * and copy its output buffer in vs->output. > -*/ > + */ > > struct VncJobQueue { > QemuCond cond; > @@ -62,7 +62,7 @@ typedef struct VncJobQueue VncJobQueue; > > /* > * We use a single global queue, but most of the functions are > - * already reetrant, so we can easilly add more than one encoding thread > + * already reentrant, so we can easily add more than one encoding thread > */ > static VncJobQueue *queue; > Reviewed-by: Stefan Weil <sw@weilnetz.de>
On Thu, Oct 18, 2012 at 05:40:53PM +0100, Peter Maydell wrote: > Fix some minor typos/grammar errors in comments. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > v1->v2: reinstated carelessly dropped 'if', noted by Stefan Weil. > > ui/vnc-jobs.c | 16 ++++++++-------- > 1 file changed, 8 insertions(+), 8 deletions(-) Reads like Shakespeare now, thanks! :D Thanks, applied to the trivial patches tree: https://github.com/stefanha/qemu/commits/trivial-patches Stefan
diff --git a/ui/vnc-jobs.c b/ui/vnc-jobs.c index 087b84d..3c592b3 100644 --- a/ui/vnc-jobs.c +++ b/ui/vnc-jobs.c @@ -33,21 +33,21 @@ /* * Locking: * - * There is three levels of locking: + * There are three levels of locking: * - jobs queue lock: for each operation on the queue (push, pop, isEmpty?) * - VncDisplay global lock: mainly used for framebuffer updates to avoid * screen corruption if the framebuffer is updated - * while the worker is doing something. + * while the worker is doing something. * - VncState::output lock: used to make sure the output buffer is not corrupted - * if two threads try to write on it at the same time + * if two threads try to write on it at the same time * - * While the VNC worker thread is working, the VncDisplay global lock is hold - * to avoid screen corruptions (this does not block vnc_refresh() because it - * uses trylock()) but the output lock is not hold because the thread work on + * While the VNC worker thread is working, the VncDisplay global lock is held + * to avoid screen corruption (this does not block vnc_refresh() because it + * uses trylock()) but the output lock is not held because the thread works on * its own output buffer. * When the encoding job is done, the worker thread will hold the output lock * and copy its output buffer in vs->output. -*/ + */ struct VncJobQueue { QemuCond cond; @@ -62,7 +62,7 @@ typedef struct VncJobQueue VncJobQueue; /* * We use a single global queue, but most of the functions are - * already reetrant, so we can easilly add more than one encoding thread + * already reentrant, so we can easily add more than one encoding thread */ static VncJobQueue *queue;
Fix some minor typos/grammar errors in comments. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- v1->v2: reinstated carelessly dropped 'if', noted by Stefan Weil. ui/vnc-jobs.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)