On Mon, Jun 02, 2014 at 07:24:43PM +0200, Zygmunt Bazyli Krynicki wrote:
> Hi.
>
> I sent this patch a while ago but I haven't seen any replies or it being
> applied in master so here it is again.
Either I fat-fingered it or a spam filter ate it. Either way, I have
queued this one and pushed it, thank you for catching it and for
resending!
Thanx, Paul
> Thanks
> ZK
> From ff8057f470c5c30a403dab66ed892005e1568ab7 Mon Sep 17 00:00:00 2001
> From: Zygmunt Krynicki <zygmunt.krynicki@xxxxxxxxxxxxx>
> Date: Mon, 28 Apr 2014 14:01:33 +0200
> Subject: [PATCH] Correct error message in lock_writer() in lock.c and
> toolsoftrade.tex
>
> Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@xxxxxxxxxxxxx>
> ---
> CodeSamples/toolsoftrade/lock.c | 4 ++--
> toolsoftrade/toolsoftrade.tex | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/CodeSamples/toolsoftrade/lock.c b/CodeSamples/toolsoftrade/lock.c
> index 1c129e2..56489a7 100644
> --- a/CodeSamples/toolsoftrade/lock.c
> +++ b/CodeSamples/toolsoftrade/lock.c
> @@ -62,7 +62,7 @@ void *lock_writer(void *arg)
> pthread_mutex_t *pmlp = (pthread_mutex_t *)arg;
>
> if (pthread_mutex_lock(pmlp) != 0) {
> - perror("lock_reader:pthread_mutex_lock");
> + perror("lock_writer:pthread_mutex_lock");
> exit(-1);
> }
> for (i = 0; i < 3; i++) {
> @@ -70,7 +70,7 @@ void *lock_writer(void *arg)
> poll(NULL, 0, 5);
> }
> if (pthread_mutex_unlock(pmlp) != 0) {
> - perror("lock_reader:pthread_mutex_unlock");
> + perror("lock_writer:pthread_mutex_unlock");
> exit(-1);
> }
> return NULL;
> diff --git a/toolsoftrade/toolsoftrade.tex b/toolsoftrade/toolsoftrade.tex
> index b4a237a..c98f3a7 100644
> --- a/toolsoftrade/toolsoftrade.tex
> +++ b/toolsoftrade/toolsoftrade.tex
> @@ -549,7 +549,7 @@ the other will wait until the first thread releases the lock.
> 34 pthread_mutex_t *pmlp = (pthread_mutex_t *)arg;
> 35
> 36 if (pthread_mutex_lock(pmlp) != 0) {
> - 37 perror("lock_reader:pthread_mutex_lock");
> + 37 perror("lock_writer:pthread_mutex_lock");
> 38 exit(-1);
> 39 }
> 40 for (i = 0; i < 3; i++) {
> @@ -557,7 +557,7 @@ the other will wait until the first thread releases the lock.
> 42 poll(NULL, 0, 5);
> 43 }
> 44 if (pthread_mutex_unlock(pmlp) != 0) {
> - 45 perror("lock_reader:pthread_mutex_unlock");
> + 45 perror("lock_writer:pthread_mutex_unlock");
> 46 exit(-1);
> 47 }
> 48 return NULL;
> --
> 1.9.1
>
--
To unsubscribe from this list: send the line "unsubscribe perfbook" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
