code review 12311045: runtime: remove dead code

runtime: remove dead code
Remove dead code related to allocation of type metadata with SysAlloc.

[dvyukov, 2013-08-04 16:35:02]

Hello golang-dev@googlegroups.com,

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

[bradfitz, 2013-08-04 18:36:09]

LGTM



On Sun, Aug 4, 2013 at 9:35 AM, <dvyukov@google.com> wrote:

> Reviewers: golang-dev1,
>
> Message:
> Hello golang-dev@googlegroups.com,
>
> I'd like you to review this change to
> https://go.googlecode.com/hg/
>
>
> Description:
> runtime: remove dead code
> Remove dead code related to allocation of type metadata with SysAlloc.
>
> Please review this at
https://codereview.appspot.**com/12311045/<https://codereview.appspot.com/123...
>
> Affected files:
>   M src/pkg/runtime/malloc.goc
>   M src/pkg/runtime/malloc.h
>   M src/pkg/runtime/mgc0.c
>   M src/pkg/runtime/mheap.c
>
>
> Index: src/pkg/runtime/malloc.goc
> ==============================**==============================**=======
> --- a/src/pkg/runtime/malloc.goc
> +++ b/src/pkg/runtime/malloc.goc
> @@ -116,7 +116,7 @@
>
>         m->mallocing = 0;
>         if(UseSpanType && !(flag & FlagNoPointers) && typ != 0 &&
> m->settype_bufsize == nelem(m->settype_buf))
> -               runtime·settype_flush(m, false);
> +               runtime·settype_flush(m);
>         m->locks--;
>         if(m->locks == 0 && g->preempt)  // restore the preemption request
> in case we've cleared it in newstack
>                 g->stackguard0 = StackPreempt;
> @@ -563,14 +563,13 @@
>  static Lock settype_lock;
>
>  void
> -runtime·settype_flush(M *mp, bool sysalloc)
> +runtime·settype_flush(M *mp)
>  {
>         uintptr *buf, *endbuf;
>         uintptr size, ofs, j, t;
>         uintptr ntypes, nbytes2, nbytes3;
>         uintptr *data2;
>         byte *data3;
> -       bool sysalloc3;
>         void *v;
>         uintptr typ, p;
>         MSpan *s;
> @@ -605,20 +604,9 @@
>                 case MTypes_Empty:
>                         ntypes = (s->npages << PageShift) / size;
>                         nbytes3 = 8*sizeof(uintptr) + 1*ntypes;
> -
> -                       if(!sysalloc) {
> -                               data3 = runtime·mallocgc(nbytes3, 0,
> FlagNoProfiling|**FlagNoPointers|FlagNoInvokeGC)**;
> -                       } else {
> -                               data3 = runtime·SysAlloc(nbytes3);
> -                               if(data3 == nil)
> -                                       runtime·throw("runtime: cannot
> allocate memory");
> -                               if(0) runtime·printf("settype(0->3):
> SysAlloc(%x) --> %p\n", (uint32)nbytes3, data3);
> -                       }
> -
> +                       data3 = runtime·mallocgc(nbytes3, 0,
> FlagNoProfiling|**FlagNoPointers|FlagNoInvokeGC)**;
>                         s->types.compression = MTypes_Bytes;
> -                       s->types.sysalloc = sysalloc;
>                         s->types.data = (uintptr)data3;
> -
>                         ((uintptr*)data3)[1] = typ;
>                         data3[8*sizeof(uintptr) + ofs] = 1;
>                         break;
> @@ -643,20 +631,8 @@
>                         } else {
>                                 ntypes = (s->npages << PageShift) / size;
>                                 nbytes2 = ntypes * sizeof(uintptr);
> -
> -                               if(!sysalloc) {
> -                                       data2 = runtime·mallocgc(nbytes2,
> 0, FlagNoProfiling|**FlagNoPointers|FlagNoInvokeGC)**;
> -                               } else {
> -                                       data2 = runtime·SysAlloc(nbytes2);
> -                                       if(data2 == nil)
> -                                               runtime·throw("runtime:
> cannot allocate memory");
> -                                       if(0)
> runtime·printf("settype.(3->2)**: SysAlloc(%x) --> %p\n",
> (uint32)nbytes2, data2);
> -                               }
> -
> -                               sysalloc3 = s->types.sysalloc;
> -
> +                               data2 = runtime·mallocgc(nbytes2, 0,
> FlagNoProfiling|**FlagNoPointers|FlagNoInvokeGC)**;
>                                 s->types.compression = MTypes_Words;
> -                               s->types.sysalloc = sysalloc;
>                                 s->types.data = (uintptr)data2;
>
>                                 // Move the contents of data3 to data2.
> Then deallocate data3.
> @@ -665,12 +641,6 @@
>                                         t = ((uintptr*)data3)[t];
>                                         data2[j] = t;
>                                 }
> -                               if(sysalloc3) {
> -                                       nbytes3 = 8*sizeof(uintptr) +
> 1*ntypes;
> -                                       if(0)
> runtime·printf("settype.(3->2)**: SysFree(%p,%x)\n", data3,
> (uint32)nbytes3);
> -                                       runtime·SysFree(data3, nbytes3);
> -                               }
> -
>                                 data2[ofs] = typ;
>                         }
>                         break;
> @@ -681,33 +651,6 @@
>         mp->settype_bufsize = 0;
>  }
>
> -void
> -runtime·settype_sysfree(MSpan *s)
> -{
> -       uintptr ntypes, nbytes;
> -
> -       if(!s->types.sysalloc)
> -               return;
> -
> -       nbytes = (uintptr)-1;
> -
> -       switch (s->types.compression) {
> -       case MTypes_Words:
> -               ntypes = (s->npages << PageShift) / s->elemsize;
> -               nbytes = ntypes * sizeof(uintptr);
> -               break;
> -       case MTypes_Bytes:
> -               ntypes = (s->npages << PageShift) / s->elemsize;
> -               nbytes = 8*sizeof(uintptr) + 1*ntypes;
> -               break;
> -       }
> -
> -       if(nbytes != (uintptr)-1) {
> -               if(0) runtime·printf("settype: SysFree(%p,%x)\n",
> (void*)s->types.data, (uint32)nbytes);
> -               runtime·SysFree((void*)s->**types.data, nbytes);
> -       }
> -}
> -
>  uintptr
>  runtime·gettype(void *v)
>  {
> Index: src/pkg/runtime/malloc.h
> ==============================**==============================**=======
> --- a/src/pkg/runtime/malloc.h
> +++ b/src/pkg/runtime/malloc.h
> @@ -334,7 +334,6 @@
>  struct MTypes
>  {
>         byte    compression;    // one of MTypes_*
> -       bool    sysalloc;       // whether (void*)data is from
> runtime·SysAlloc
>         uintptr data;
>  };
>
> @@ -459,7 +458,7 @@
>  void*  runtime·cnew(Type*);
>  void*  runtime·cnewarray(Type*, intgo);
>
> -void   runtime·settype_flush(M*, bool);
> +void   runtime·settype_flush(M*);
>  void   runtime·settype_sysfree(MSpan***);
>  uintptr        runtime·gettype(void*);
>
> Index: src/pkg/runtime/mgc0.c
> ==============================**==============================**=======
> --- a/src/pkg/runtime/mgc0.c
> +++ b/src/pkg/runtime/mgc0.c
> @@ -2084,7 +2084,7 @@
>                 runtime·memclr((byte*)&**gcstats, sizeof(gcstats));
>
>         for(mp=runtime·allm; mp; mp=mp->alllink)
> -               runtime·settype_flush(mp, false);
> +               runtime·settype_flush(mp);
>
>         heap0 = 0;
>         obj0 = 0;
> Index: src/pkg/runtime/mheap.c
> ==============================**==============================**=======
> --- a/src/pkg/runtime/mheap.c
> +++ b/src/pkg/runtime/mheap.c
> @@ -330,8 +330,6 @@
>         MSpan *t;
>         PageID p;
>
> -       if(s->types.sysalloc)
> -               runtime·settype_sysfree(s);
>         s->types.compression = MTypes_Empty;
>
>         if(s->state != MSpanInUse || s->ref != 0) {
>
>
> --
>
> ---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<golang-dev%2Bunsubscribe@googlegrou...
> .
> For more options, visit
https://groups.google.com/**groups/opt_out<https://groups.google.com/groups/o...
> .
>
>
>

[dvyukov, 2013-08-04 19:32:15]

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

runtime: remove dead code
Remove dead code related to allocation of type metadata with SysAlloc.

R=golang-dev, bradfitz
CC=golang-dev
https://codereview.appspot.com/12311045