projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
d760942
)
better error messages when PAPI_library_init() fails
author
Simon Marlow
<simonmar@microsoft.com>
Mon, 20 Nov 2006 14:27:38 +0000
(14:27 +0000)
committer
Simon Marlow
<simonmar@microsoft.com>
Mon, 20 Nov 2006 14:27:38 +0000
(14:27 +0000)
rts/RtsStartup.c
patch
|
blob
|
history
diff --git
a/rts/RtsStartup.c
b/rts/RtsStartup.c
index
f2a0dd7
..
c2f765a
100644
(file)
--- a/
rts/RtsStartup.c
+++ b/
rts/RtsStartup.c
@@
-160,9
+160,18
@@
hs_init(int *argc, char **argv[])
/* Initialise the performance tracking library */
#ifdef USE_PAPI
/* Initialise the performance tracking library */
#ifdef USE_PAPI
- /* Must fix to abort gracefully */
- if(PAPI_library_init(PAPI_VER_CURRENT) != PAPI_VER_CURRENT)
- exit(1);
+ {
+ int ver;
+ if ((ver = PAPI_library_init(PAPI_VER_CURRENT)) != PAPI_VER_CURRENT) {
+ if (ver > 0) {
+ errorBelch("PAPI_library_init: wrong version: %x", ver);
+ stg_exit(EXIT_FAILURE);
+ } else {
+ sysErrorBelch("PAPI_library_init");
+ stg_exit(EXIT_FAILURE);
+ }
+ }
+ }
#ifdef THREADED_RTS
{
int err;
#ifdef THREADED_RTS
{
int err;