code review 4306043: runtime: cpu profiling support

src/pkg/runtime/linux/arm/signal.c

 // Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
 #include "runtime.h"
 #include "defs.h"
 #include "signals.h"
 #include "os.h"
 
 void
@@ skipping 106 matching lines @@
 runtime·signalstack(byte *p, int32 n)
 {
         Sigaltstack st;
 
         st.ss_sp = p;
         st.ss_size = n;
         st.ss_flags = 0;
         runtime·sigaltstack(&st, nil);
 }
 
+static void
+sigaction(int32 i, void (*fn)(int32, Siginfo*, void*, G*), bool restart)
+{
+        Sigaction sa;
+
+        runtime·memclr((byte*)&sa, sizeof sa);
+        sa.sa_flags = SA_ONSTACK | SA_SIGINFO | SA_RESTORER;
+        if(restart)
+                sa.sa_flags |= SA_RESTART;
+        sa.sa_mask = ~0ULL;
+        sa.sa_restorer = (void*)runtime·sigreturn;
+        sa.k_sa_handler = fn;
+        runtime·rt_sigaction(i, &sa, nil, 8);
+}
+
 void
 runtime·initsig(int32 queue)
 {
         int32 i;
-        Sigaction sa;
+        void *fn;
 
         runtime·siginit();
 
-        runtime·memclr((byte*)&sa, sizeof sa);
-        sa.sa_flags = SA_ONSTACK | SA_SIGINFO | SA_RESTORER;
-        sa.sa_mask.sig[0] = 0xFFFFFFFF;
-        sa.sa_mask.sig[1] = 0xFFFFFFFF;
-        sa.sa_restorer = (void*)runtime·sigreturn;
         for(i = 0; i<NSIG; i++) {
                 if(runtime·sigtab[i].flags) {
                         if((runtime·sigtab[i].flags & SigQueue) != queue)
                                 continue;
                         if(runtime·sigtab[i].flags & (SigCatch | SigQueue))
-                                sa.sa_handler = (void*)runtime·sigtramp;
+                                fn = runtime·sighandler;
                         else
-                                sa.sa_handler = (void*)runtime·sigignore;
-                        if(runtime·sigtab[i].flags & SigRestart)
-                                sa.sa_flags |= SA_RESTART;
-                        else
-                                sa.sa_flags &= ~SA_RESTART;
-                        runtime·rt_sigaction(i, &sa, nil, 8);
+                                fn = runtime·sigignore;
+                        sigaction(i, fn, (runtime·sigtab[i].flags & SigRestart) != 0);
                 }
         }
 }
 
 void
 runtime·resetcpuprofiler(int32 hz)
 {
         Sigaction sa;
         Itimerval it;
 ········
+        runtime·memclr((byte*)&it, sizeof it);
         if(hz == 0) {
-                runtime·memclr((byte*)&it, sizeof it);
                 runtime·setitimer(ITIMER_PROF, &it, nil);
-        }
- ·······
-        runtime·memclr((byte*)&sa, sizeof sa);
-        sa.sa_flags = SA_ONSTACK | SA_SIGINFO | SA_RESTORER | SA_RESTART;
-        sa.sa_mask = ~0ULL;
-        sa.sa_restorer = (void*)runtime·sigreturn;
-        if(hz > 0)
-                sa.sa_handler = (void*)runtime·sigtramp;
-        else
-                sa.sa_handler = SIG_IGN;
-        runtime·rt_sigaction(SIGPROF, &sa, nil, 8);
- ·······
-        if(hz > 0) {
+                sigaction(SIGPROF, SIG_IGN, true);
+        } else {
+                sigaction(SIGPROF, runtime·sighandler, true);
                 it.it_interval.tv_sec = 0;
                 it.it_interval.tv_usec = 1000000 / hz;
                 it.it_value = it.it_interval;
                 runtime·setitimer(ITIMER_PROF, &it, nil);
         }
-········
         m->profilehz = hz;
 }