code review 7333047: runtime: fix sigaction struct on freebsd

runtime: fix sigaction struct on freebsd

Fix the sa_mask member of the sigaction struct - on FreeBSD this is
declared as a sigset_t, which is an array of four unsigned ints.
Replace the current int64 with Sigset from defs_freebsd_GOARCH, which
has the correct definition.

Unbreaks the FreeBSD builds.

[jsing, 2013-02-16 15:50:56]

Hello golang-dev@googlegroups.com,

I'd like you to review this change to
https://go.googlecode.com/hg/

[dave_cheney.net, 2013-02-16 22:17:39]

FreeBSD arm ?

On Sun, Feb 17, 2013 at 2:50 AM,  <jsing@google.com> wrote:
> Reviewers: golang-dev_googlegroups.com,
>
> Message:
> Hello golang-dev@googlegroups.com,
>
> I'd like you to review this change to
> https://go.googlecode.com/hg/
>
>
> Description:
> runtime: fix sigaction struct on freebsd
>
> Fix the sa_mask member of the sigaction struct - on FreeBSD this is
> declared as a sigset_t, which is an array of four unsigned ints.
> Replace the current int64 with Sigset from defs_freebsd_GOARCH, which
> has the correct definition.
>
> Unbreaks the FreeBSD builds.
>
> Please review this at https://codereview.appspot.com/7333047/
>
> Affected files:
>   M src/pkg/runtime/signal_freebsd_386.c
>   M src/pkg/runtime/signal_freebsd_amd64.c
>
>
> Index: src/pkg/runtime/signal_freebsd_386.c
> ===================================================================
> --- a/src/pkg/runtime/signal_freebsd_386.c
> +++ b/src/pkg/runtime/signal_freebsd_386.c
> @@ -15,7 +15,7 @@
>                 void    (*__sa_sigaction)(int32, Siginfo*, void *);
>         } __sigaction_u;                /* signal handler */
>         int32   sa_flags;               /* see signal options below */
> -       int64   sa_mask;                /* signal mask to apply */
> +       Sigset  sa_mask;                /* signal mask to apply */
>  } Sigaction;
>
>  void
> @@ -141,7 +141,10 @@
>         sa.sa_flags = SA_SIGINFO|SA_ONSTACK;
>         if(restart)
>                 sa.sa_flags |= SA_RESTART;
> -       sa.sa_mask = ~0ULL;
> +       sa.sa_mask.__bits[0] = ~(uint32)0;
> +       sa.sa_mask.__bits[1] = ~(uint32)0;
> +       sa.sa_mask.__bits[2] = ~(uint32)0;
> +       sa.sa_mask.__bits[3] = ~(uint32)0;
>         if (fn == runtime·sighandler)
>                 fn = (void*)runtime·sigtramp;
>         sa.__sigaction_u.__sa_sigaction = (void*)fn;
> Index: src/pkg/runtime/signal_freebsd_amd64.c
> ===================================================================
> --- a/src/pkg/runtime/signal_freebsd_amd64.c
> +++ b/src/pkg/runtime/signal_freebsd_amd64.c
> @@ -15,7 +15,7 @@
>                 void    (*__sa_sigaction)(int32, Siginfo*, void *);
>         } __sigaction_u;                /* signal handler */
>         int32   sa_flags;               /* see signal options below */
> -       int64   sa_mask;                /* signal mask to apply */
> +       Sigset  sa_mask;                /* signal mask to apply */
>  } Sigaction;
>
>  void
> @@ -149,7 +149,10 @@
>         sa.sa_flags = SA_SIGINFO|SA_ONSTACK;
>         if(restart)
>                 sa.sa_flags |= SA_RESTART;
> -       sa.sa_mask = ~0ULL;
> +       sa.sa_mask.__bits[0] = ~(uint32)0;
> +       sa.sa_mask.__bits[1] = ~(uint32)0;
> +       sa.sa_mask.__bits[2] = ~(uint32)0;
> +       sa.sa_mask.__bits[3] = ~(uint32)0;
>         if (fn == runtime·sighandler)
>                 fn = (void*)runtime·sigtramp;
>         sa.__sigaction_u.__sa_sigaction = (void*)fn;
>
>
> --
>
> ---You received this message because you are subscribed to the Google Groups
> "golang-dev" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to golang-dev+unsubscribe@googlegroups.com.
> For more options, visit https://groups.google.com/groups/opt_out.
>
>

[jsing, 2013-02-17 13:10:16]

On 2013/02/16 22:17:39, dfc wrote:
> FreeBSD arm ?

The fix should be the same, so I've added it to this change. I have no way of
testing this however.

[dave_cheney.net, 2013-02-17 13:25:58]

I can test tomorrow on freebsd/arm. I believe your proposal will be proven
correct
On 18 Feb 2013 00:10, <jsing@google.com> wrote:

> On 2013/02/16 22:17:39, dfc wrote:
>
>> FreeBSD arm ?
>>
>
> The fix should be the same, so I've added it to this change. I have no
> way of testing this however.
>
>
https://codereview.appspot.**com/7333047/<https://codereview.appspot.com/7333...
>

[minux1, 2013-02-17 13:39:46]

LGTM. Tested on freebsd/arm and freebsd/amd64.

[jsing, 2013-02-17 16:23:40]

*** Submitted as https://code.google.com/p/go/source/detail?r=ddad93a43297 ***

runtime: fix sigaction struct on freebsd

Fix the sa_mask member of the sigaction struct - on FreeBSD this is
declared as a sigset_t, which is an array of four unsigned ints.
Replace the current int64 with Sigset from defs_freebsd_GOARCH, which
has the correct definition.

Unbreaks the FreeBSD builds.

R=golang-dev, dave, minux.ma
CC=golang-dev
https://codereview.appspot.com/7333047