[PATCH] Don't exit() from library

[PATCH] Don't exit() from library

[Ritesh Raj Sarraf]

Also call pthread_attr_destroy() on thread creation failure

Signed-off-by: Ritesh Raj Sarraf <rrs@debian.org>
---
 libmpathpersist/mpath_persist.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/libmpathpersist/mpath_persist.c b/libmpathpersist/mpath_persist.c
index bd30125..b74ce4e 100644
--- a/libmpathpersist/mpath_persist.c
+++ b/libmpathpersist/mpath_persist.c
@@ -585,11 +585,14 @@ int send_prout_activepath(char * dev, int rq_servact, int rq_scope,
 	rc = pthread_create(&thread, &attr, mpath_prout_pthread_fn, (void *)(&param));
 	if (rc){
 		condlog (3, "%s: failed to create thread %d", dev, rc);
-		exit(-1);
+		/* Destroy the thread attribute since we failed to create */
+		pthread_attr_destroy(&attr);
+	}
+	else {
+		/* Free attribute and wait for the other threads */
+		pthread_attr_destroy(&attr);
+		rc = pthread_join(thread, NULL);
 	}
-	/* Free attribute and wait for the other threads */
-	pthread_attr_destroy(&attr);
-	rc = pthread_join(thread, NULL);
 
 	return (param.status);
 }
-- 
1.9.0

Re: [PATCH] Don't exit() from library

[Bart Van Assche]

On 03/11/14 07:10, Ritesh Raj Sarraf wrote:
> Also call pthread_attr_destroy() on thread creation failure
> 
> Signed-off-by: Ritesh Raj Sarraf <rrs@debian.org>
> ---
>  libmpathpersist/mpath_persist.c | 11 +++++++----
>  1 file changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/libmpathpersist/mpath_persist.c b/libmpathpersist/mpath_persist.c
> index bd30125..b74ce4e 100644
> --- a/libmpathpersist/mpath_persist.c
> +++ b/libmpathpersist/mpath_persist.c
> @@ -585,11 +585,14 @@ int send_prout_activepath(char * dev, int rq_servact, int rq_scope,
>  	rc = pthread_create(&thread, &attr, mpath_prout_pthread_fn, (void *)(&param));
>  	if (rc){
>  		condlog (3, "%s: failed to create thread %d", dev, rc);
> -		exit(-1);
> +		/* Destroy the thread attribute since we failed to create */
> +		pthread_attr_destroy(&attr);
> +	}
> +	else {
> +		/* Free attribute and wait for the other threads */
> +		pthread_attr_destroy(&attr);
> +		rc = pthread_join(thread, NULL);
>  	}
> -	/* Free attribute and wait for the other threads */
> -	pthread_attr_destroy(&attr);
> -	rc = pthread_join(thread, NULL);
>  
>  	return (param.status);
>  }

Hello Ritesh,

Maybe there is something I'm not aware of, but is there any reason why
the pthread_attr_destroy() call occurs twice in this patch instead of
invoking it before the "if (rc) {" statement ? From the
pthread_attr_destroy() man page: "Destroying a thread  attributes object
has no effect on threads that were created using that object".

Thanks,

Bart.

Re: [PATCH] Don't exit() from library

[Ritesh Raj Sarraf]

[-- Attachment #1.1: Type: text/plain, Size: 613 bytes --]

On 03/11/2014 02:15 PM, Bart Van Assche wrote:
> Hello Ritesh,
>
> Maybe there is something I'm not aware of, but is there any reason why
> the pthread_attr_destroy() call occurs twice in this patch instead of
> invoking it before the "if (rc) {" statement ? From the
> pthread_attr_destroy() man page: "Destroying a thread  attributes object
> has no effect on threads that were created using that object".
Yup!! You're right. I won't have access to the dev box today. Can you
please follow it up ?

-- 
Ritesh Raj Sarraf | http://people.debian.org/~rrs
Debian - The Universal Operating System



[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

[-- Attachment #2: Type: text/plain, Size: 0 bytes --]