code review 140050043: runtime: retry fix openbsd build

runtime: retry fix openbsd build

Tested on linux/amd64 too this time.

[mdempsky, 2014-08-30 06:01:27]

Hello golang-codereviews@googlegroups.com (cc: dave@cheney.net, iant@golang.org,
rsc@golang.org),

I'd like you to review this change to
https://code.google.com/p/go

[bradfitz, 2014-08-30 06:12:51]

LGTM

If any builds break, I'll roll it back.



On Fri, Aug 29, 2014 at 11:01 PM, mdempsky via golang-codereviews <
golang-codereviews@googlegroups.com> wrote:

> Reviewers: golang-codereviews,
>
> Message:
> Hello golang-codereviews@googlegroups.com (cc: dave@cheney.net,
> iant@golang.org, rsc@golang.org),
>
> I'd like you to review this change to
> https://code.google.com/p/go
>
>
> Description:
> runtime: retry fix openbsd build
>
> Tested on linux/amd64 too this time.
>
> Please review this at https://codereview.appspot.com/140050043/
>
> Affected files (+9, -9 lines):
>   M src/pkg/runtime/defs_openbsd.go
>   M src/pkg/runtime/defs_openbsd_386.h
>   M src/pkg/runtime/defs_openbsd_amd64.h
>   M src/pkg/runtime/os_openbsd.c
>
>
> Index: src/pkg/runtime/defs_openbsd.go
> ===================================================================
> --- a/src/pkg/runtime/defs_openbsd.go
> +++ b/src/pkg/runtime/defs_openbsd.go
> @@ -104,7 +104,7 @@
>         EVFILT_WRITE = C.EVFILT_WRITE
>  )
>
> -type Tfork C.struct___tfork
> +type TforkT C.struct___tfork
>
>  type SigaltstackT C.struct_sigaltstack
>  type Sigcontext C.struct_sigcontext
> @@ -118,4 +118,4 @@
>  type Timeval C.struct_timeval
>  type Itimerval C.struct_itimerval
>
> -type Kevent C.struct_kevent
> +type KeventT C.struct_kevent
> Index: src/pkg/runtime/defs_openbsd_386.h
> ===================================================================
> --- a/src/pkg/runtime/defs_openbsd_386.h
> +++ b/src/pkg/runtime/defs_openbsd_386.h
> @@ -81,7 +81,7 @@
>         EVFILT_WRITE    = -0x2,
>  };
>
> -typedef struct Tfork Tfork;
> +typedef struct TforkT TforkT;
>  typedef struct SigaltstackT SigaltstackT;
>  typedef struct Sigcontext Sigcontext;
>  typedef struct Siginfo Siginfo;
> @@ -93,7 +93,7 @@
>
>  #pragma pack on
>
> -struct Tfork {
> +struct TforkT {
>         byte    *tf_tcb;
>         int32   *tf_tid;
>         byte    *tf_stack;
> Index: src/pkg/runtime/defs_openbsd_amd64.h
> ===================================================================
> --- a/src/pkg/runtime/defs_openbsd_amd64.h
> +++ b/src/pkg/runtime/defs_openbsd_amd64.h
> @@ -81,7 +81,7 @@
>         EVFILT_WRITE    = -0x2,
>  };
>
> -typedef struct Tfork Tfork;
> +typedef struct TforkT TforkT;
>  typedef struct SigaltstackT SigaltstackT;
>  typedef struct Sigcontext Sigcontext;
>  typedef struct Siginfo Siginfo;
> @@ -93,7 +93,7 @@
>
>  #pragma pack on
>
> -struct Tfork {
> +struct TforkT {
>         byte    *tf_tcb;
>         int32   *tf_tid;
>         byte    *tf_stack;
> Index: src/pkg/runtime/os_openbsd.c
> ===================================================================
> --- a/src/pkg/runtime/os_openbsd.c
> +++ b/src/pkg/runtime/os_openbsd.c
> @@ -26,7 +26,7 @@
>  static Sigset sigset_none;
>  static Sigset sigset_all = ~(Sigset)0;
>
> -extern int32 runtime·tfork(void *param, uintptr psize, M *mp, G *gp, void
> (*fn)(void));
> +extern int32 runtime·tfork(TforkT *param, uintptr psize, M *mp, G *gp,
> void (*fn)(void));
>  extern int32 runtime·thrsleep(void *ident, int32 clock_id, void *tsp,
> void *lock, const int32 *abort);
>  extern int32 runtime·thrwakeup(void *ident, int32 n);
>
> @@ -130,7 +130,7 @@
>  void
>  runtime·newosproc(M *mp, void *stk)
>  {
> -       Tfork param;
> +       TforkT param;
>         Sigset oset;
>         int32 ret;
>
> @@ -147,7 +147,7 @@
>         param.tf_stack = stk;
>
>         oset = runtime·sigprocmask(SIG_SETMASK, sigset_all);
> -       ret = runtime·tfork((byte*)&param, sizeof(param), mp, mp->g0,
> runtime·mstart);
> +       ret = runtime·tfork(&param, sizeof(param), mp, mp->g0,
> runtime·mstart);
>         runtime·sigprocmask(SIG_SETMASK, oset);
>
>         if(ret < 0) {
>
>
> --
> You received this message because you are subscribed to the Google Groups
> "golang-codereviews" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to golang-codereviews+unsubscribe@googlegroups.com.
> For more options, visit https://groups.google.com/d/optout.
>

[bradfitz, 2014-08-30 06:13:20]

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

runtime: retry fix openbsd build

Tested on linux/amd64 too this time.

LGTM=bradfitz
R=golang-codereviews, bradfitz
CC=dave, golang-codereviews, iant, rsc
https://codereview.appspot.com/140050043

Committer: Brad Fitzpatrick <bradfitz@golang.org>

[gobot, 2014-08-30 06:59:59]

This CL appears to have broken the freebsd-amd64-race builder.
See http://build.golang.org/log/a2bb6e0c3169a498e43f071a0526c934adcc734b

[mdempsky, 2014-08-30 07:01:36]

On Fri, Aug 29, 2014 at 11:59 PM, <gobot@golang.org> wrote:

> This CL appears to have broken the freebsd-amd64-race builder.
> See http://build.golang.org/log/a2bb6e0c3169a498e43f071a0526c934adcc734b


Nope, flake:

--- FAIL: TestCPUProfileMultithreaded (29.25s)
pprof_test.go:136: crc32.ChecksumIEEE: 0
pprof_test.go:136: crc32.Update: 2
 pprof_test.go:150: crc32.ChecksumIEEE has 0 samples out of 2, want at
least 1, ideally 1
FAIL
FAIL runtime/pprof 64.268s