git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

runtime, runtime/pprof: Fix runtime/pprof test to pass, enable it. 

From-SVN: r189878
This commit is contained in:
Ian Lance Taylor 2012-07-26 01:57:04 +00:00
parent f34ee0b290
commit 1fae9801e4
6 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libgo/Makefile.am
View File

@ -1794,7 +1794,7 @@ GOTESTFLAGS =
# Check a package. # Check a package.
CHECK = \ CHECK = \
GC="$(GOC) $(GOCFLAGS) -L `${PWD_COMMAND}` -L `${PWD_COMMAND}`/.libs"; \ GC="$(GOC) $(GOCFLAGS) $($(subst /,_,$@)_GOCFLAGS) -L `${PWD_COMMAND}` -L `${PWD_COMMAND}`/.libs"; \
export GC; \ export GC; \
GOLIBS="$(MATH_LIBS) $(NET_LIBS)"; \ GOLIBS="$(MATH_LIBS) $(NET_LIBS)"; \
export GOLIBS; \ export GOLIBS; \
@ -3012,6 +3012,9 @@ runtime/pprof.lo: $(go_runtime_pprof_files)
runtime/pprof/check: $(CHECK_DEPS) runtime/pprof/check: $(CHECK_DEPS)
@$(CHECK) @$(CHECK)
.PHONY: runtime/pprof/check .PHONY: runtime/pprof/check
# At least for now, we need -static-libgo for this test, because
# otherwise we can't get the line numbers.
runtime_pprof_check_GOCFLAGS = -static-libgo
@go_include@ sync/atomic.lo.dep @go_include@ sync/atomic.lo.dep
sync/atomic.lo.dep: $(go_sync_atomic_files) sync/atomic.lo.dep: $(go_sync_atomic_files)
@ -3548,6 +3551,7 @@ TEST_PACKAGES = \
os/user/check \ os/user/check \
path/filepath/check \ path/filepath/check \
regexp/syntax/check \ regexp/syntax/check \
runtime/pprof/check \
sync/atomic/check \ sync/atomic/check \
text/scanner/check \ text/scanner/check \
text/tabwriter/check \ text/tabwriter/check \

6
libgo/Makefile.in
View File

@ -2029,7 +2029,7 @@ GOTESTFLAGS =
# Check a package. # Check a package.
CHECK = \ CHECK = \
GC="$(GOC) $(GOCFLAGS) -L `${PWD_COMMAND}` -L `${PWD_COMMAND}`/.libs"; \ GC="$(GOC) $(GOCFLAGS) $($(subst /,_,$@)_GOCFLAGS) -L `${PWD_COMMAND}` -L `${PWD_COMMAND}`/.libs"; \
export GC; \ export GC; \
GOLIBS="$(MATH_LIBS) $(NET_LIBS)"; \ GOLIBS="$(MATH_LIBS) $(NET_LIBS)"; \
export GOLIBS; \ export GOLIBS; \
@ -2089,6 +2089,9 @@ CHECK_DEPS = libgo.la libgobegin.a \
$(toolexeclibgotexttemplate_DATA) \ $(toolexeclibgotexttemplate_DATA) \
$(toolexeclibgounicode_DATA) $(toolexeclibgounicode_DATA)
# At least for now, we need -static-libgo for this test, because
# otherwise we can't get the line numbers.
runtime_pprof_check_GOCFLAGS = -static-libgo
# How to build a .gox file from a .lo file. # How to build a .gox file from a .lo file.
BUILDGOX = \ BUILDGOX = \
@ -2218,6 +2221,7 @@ TEST_PACKAGES = \
os/user/check \ os/user/check \
path/filepath/check \ path/filepath/check \
regexp/syntax/check \ regexp/syntax/check \
runtime/pprof/check \
sync/atomic/check \ sync/atomic/check \
text/scanner/check \ text/scanner/check \
text/tabwriter/check \ text/tabwriter/check \

3
libgo/go/runtime/pprof/pprof_test.go
View File

@ -71,7 +71,8 @@ func TestCPUProfile(t *testing.T) {
if f == nil { if f == nil {
continue continue
} }
if strings.Contains(f.Name(), "ChecksumIEEE") { if strings.Contains(f.Name(), "ChecksumIEEE") ||
(strings.Contains(f.Name(), "update") && strings.Contains(f.Name(), "crc32")) {
found = true found = true
} }
} }

3
libgo/runtime/go-signal.c
View File

@ -149,8 +149,7 @@ sig_handler (int sig)
#ifdef SIGPROF #ifdef SIGPROF
if (sig == SIGPROF) if (sig == SIGPROF)
{ {
/* FIXME. */ runtime_sigprof ();
runtime_sigprof (0, 0, nil, nil);
return; return;
} }
#endif #endif

5
libgo/runtime/proc.c
View File

@ -1681,10 +1681,7 @@ static struct {
// Called if we receive a SIGPROF signal. // Called if we receive a SIGPROF signal.
void void
runtime_sigprof(uint8 *pc __attribute__ ((unused)), runtime_sigprof()
uint8 *sp __attribute__ ((unused)),
uint8 *lr __attribute__ ((unused)),
G *gp __attribute__ ((unused)))
{ {
int32 n; int32 n;

2
libgo/runtime/runtime.h
View File

@ -451,7 +451,7 @@ const byte* runtime_getenv(const char*);
int32 runtime_atoi(const byte*); int32 runtime_atoi(const byte*);
uint32 runtime_fastrand1(void); uint32 runtime_fastrand1(void);
void runtime_sigprof(uint8 *pc, uint8 *sp, uint8 *lr, G *gp); void runtime_sigprof();
void runtime_resetcpuprofiler(int32); void runtime_resetcpuprofiler(int32);
void runtime_setcpuprofilerate(void(*)(uintptr*, int32), int32); void runtime_setcpuprofilerate(void(*)(uintptr*, int32), int32);
void runtime_usleep(uint32); void runtime_usleep(uint32);