You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jf...@apache.org on 2005/01/04 09:57:47 UTC
svn commit: r124075 - /apr/apr/trunk/threadproc/unix/signals.c
Author: jfclere
Date: Tue Jan 4 00:57:44 2005
New Revision: 124075
URL: http://svn.apache.org/viewcvs?view=rev&rev=124075
Log:
sigprocmask should be used instead pthread_sigmask on nothreaded platforms.
Modified:
apr/apr/trunk/threadproc/unix/signals.c
Modified: apr/apr/trunk/threadproc/unix/signals.c
Url: http://svn.apache.org/viewcvs/apr/apr/trunk/threadproc/unix/signals.c?view=diff&rev=124075&p1=apr/apr/trunk/threadproc/unix/signals.c&r1=124074&p2=apr/apr/trunk/threadproc/unix/signals.c&r2=124075
==============================================================================
--- apr/apr/trunk/threadproc/unix/signals.c (original)
+++ apr/apr/trunk/threadproc/unix/signals.c Tue Jan 4 00:57:44 2005
@@ -409,7 +409,7 @@
sigfillset(&sig_mask);
remove_sync_sigs(&sig_mask);
-#if defined(SIGPROCMASK_SETS_THREAD_MASK)
+#if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS
if ((rv = sigprocmask(SIG_SETMASK, &sig_mask, NULL)) != 0) {
rv = errno;
}
@@ -435,7 +435,7 @@
sigaddset(&sig_mask, signum);
-#if defined(SIGPROCMASK_SETS_THREAD_MASK)
+#if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS
if ((rv = sigprocmask(SIG_BLOCK, &sig_mask, NULL)) != 0) {
rv = errno;
}
@@ -462,7 +462,7 @@
sigaddset(&sig_mask, signum);
-#if defined(SIGPROCMASK_SETS_THREAD_MASK)
+#if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS
if ((rv = sigprocmask(SIG_UNBLOCK, &sig_mask, NULL)) != 0) {
rv = errno;
}
Re: svn commit: r124075 - /apr/apr/trunk/threadproc/unix/signals.c
Posted by jean-frederic clere <jf...@fujitsu-siemens.com>.
Bill Stoddard wrote:
> This is well outside my current knowledge, so take this comment for
> what's its worth (probably not much)...
>
> Would it make more sense to properly set SIGPROCMASK_SETS_THREAD_MASK
> depending on whether APR_HAS_THREADS or not?
yes, but where to add:
+++
#if APR_HAS_THREADS
#define SIGPROCMASK_SETS_THREAD_MASK
#endif
+++
Jean-Frederic
>
> Bill
>
> jfclere@apache.org wrote:
>
>> Author: jfclere
>> Date: Tue Jan 4 00:57:44 2005
>> New Revision: 124075
>>
>> URL: http://svn.apache.org/viewcvs?view=rev&rev=124075
>> Log:
>> sigprocmask should be used instead pthread_sigmask on nothreaded
>> platforms.
>>
>> Modified:
>> apr/apr/trunk/threadproc/unix/signals.c
>>
>> Modified: apr/apr/trunk/threadproc/unix/signals.c
>> Url:
>> http://svn.apache.org/viewcvs/apr/apr/trunk/threadproc/unix/signals.c?view=diff&rev=124075&p1=apr/apr/trunk/threadproc/unix/signals.c&r1=124074&p2=apr/apr/trunk/threadproc/unix/signals.c&r2=124075
>>
>> ==============================================================================
>>
>> --- apr/apr/trunk/threadproc/unix/signals.c (original)
>> +++ apr/apr/trunk/threadproc/unix/signals.c Tue Jan 4 00:57:44 2005
>> @@ -409,7 +409,7 @@
>> sigfillset(&sig_mask);
>> remove_sync_sigs(&sig_mask);
>>
>> -#if defined(SIGPROCMASK_SETS_THREAD_MASK)
>> +#if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS
>> if ((rv = sigprocmask(SIG_SETMASK, &sig_mask, NULL)) != 0) {
>> rv = errno;
>> }
>> @@ -435,7 +435,7 @@
>>
>> sigaddset(&sig_mask, signum);
>>
>> -#if defined(SIGPROCMASK_SETS_THREAD_MASK)
>> +#if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS
>> if ((rv = sigprocmask(SIG_BLOCK, &sig_mask, NULL)) != 0) {
>> rv = errno;
>> }
>> @@ -462,7 +462,7 @@
>>
>> sigaddset(&sig_mask, signum);
>>
>> -#if defined(SIGPROCMASK_SETS_THREAD_MASK)
>> +#if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS
>> if ((rv = sigprocmask(SIG_UNBLOCK, &sig_mask, NULL)) != 0) {
>> rv = errno;
>> }
>>
>
>
Re: svn commit: r124075 - /apr/apr/trunk/threadproc/unix/signals.c
Posted by Bill Stoddard <bi...@wstoddard.com>.
This is well outside my current knowledge, so take this comment for what's its worth (probably not much)...
Would it make more sense to properly set SIGPROCMASK_SETS_THREAD_MASK depending on whether APR_HAS_THREADS or
not?
Bill
jfclere@apache.org wrote:
> Author: jfclere
> Date: Tue Jan 4 00:57:44 2005
> New Revision: 124075
>
> URL: http://svn.apache.org/viewcvs?view=rev&rev=124075
> Log:
> sigprocmask should be used instead pthread_sigmask on nothreaded platforms.
>
> Modified:
> apr/apr/trunk/threadproc/unix/signals.c
>
> Modified: apr/apr/trunk/threadproc/unix/signals.c
> Url: http://svn.apache.org/viewcvs/apr/apr/trunk/threadproc/unix/signals.c?view=diff&rev=124075&p1=apr/apr/trunk/threadproc/unix/signals.c&r1=124074&p2=apr/apr/trunk/threadproc/unix/signals.c&r2=124075
> ==============================================================================
> --- apr/apr/trunk/threadproc/unix/signals.c (original)
> +++ apr/apr/trunk/threadproc/unix/signals.c Tue Jan 4 00:57:44 2005
> @@ -409,7 +409,7 @@
> sigfillset(&sig_mask);
> remove_sync_sigs(&sig_mask);
>
> -#if defined(SIGPROCMASK_SETS_THREAD_MASK)
> +#if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS
> if ((rv = sigprocmask(SIG_SETMASK, &sig_mask, NULL)) != 0) {
> rv = errno;
> }
> @@ -435,7 +435,7 @@
>
> sigaddset(&sig_mask, signum);
>
> -#if defined(SIGPROCMASK_SETS_THREAD_MASK)
> +#if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS
> if ((rv = sigprocmask(SIG_BLOCK, &sig_mask, NULL)) != 0) {
> rv = errno;
> }
> @@ -462,7 +462,7 @@
>
> sigaddset(&sig_mask, signum);
>
> -#if defined(SIGPROCMASK_SETS_THREAD_MASK)
> +#if defined(SIGPROCMASK_SETS_THREAD_MASK) || ! APR_HAS_THREADS
> if ((rv = sigprocmask(SIG_UNBLOCK, &sig_mask, NULL)) != 0) {
> rv = errno;
> }
>