diff --git a/CMake/Modules/FindDl.cmake b/CMake/Modules/FindDl.cmake new file mode 100644 index 0000000000..eca9b7a610 --- /dev/null +++ b/CMake/Modules/FindDl.cmake @@ -0,0 +1,24 @@ +# Stick to traditional approaches here. The following are defined. + +# DL_FOUND - The system has the dl library. +# DL_INCLUDE_DIR - The dl include directory. +# DL_LIBRARIES - The library file to link to. + +if (DL_INCLUDE_DIR AND DL_LIBRARIES) + # Already in cache, so don't repeat the finding procedures. + set(DL_FIND_QUIETLY TRUE) +endif() + +find_path(DL_INCLUDE_DIR dlfcn.h + PATHS /usr/local/include /usr/include +) + +find_library(DL_LIBRARIES dl + PATHS /usr/local/lib /usr/lib /lib +) + +include(FindPackageHandleStandardArgs) +find_package_handle_standard_args(DL DEFAULT_MSG DL_LIBRARIES DL_INCLUDE_DIR) + +mark_as_advanced(DL_INCLUDE_DIR DL_LIBRARIES) + diff --git a/StepmaniaCore.cmake b/StepmaniaCore.cmake index ab74097c5a..08fe555faf 100644 --- a/StepmaniaCore.cmake +++ b/StepmaniaCore.cmake @@ -342,12 +342,7 @@ elseif(LINUX) message(FATAL_ERROR "jpeg support required.") endif() - find_library(DL_LIBRARY dl) - if(${LIBDL_FOUND}) - set(HAS_LIBDL TRUE) - else() - set(HAS_LIBDL FALSE) - endif() + find_package(Dl) find_package(Xrandr) if (${XRANDR_FOUND}) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 88797dddf0..b706b7d686 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -280,6 +280,11 @@ else() # Linux sm_add_compile_definition("${SM_EXE_NAME}" BACKTRACE_METHOD_X86_LINUX) sm_add_compile_definition("${SM_EXE_NAME}" BACKTRACE_METHOD_TEXT="x86 custom backtrace") sm_add_compile_definition("${SM_EXE_NAME}" BACKTRACE_LOOKUP_METHOD_TEXT="backtrace_symbols") + if (${DL_FOUND}) + sm_add_compile_definition("${SM_EXE_NAME}" BACKTRACE_LOOKUP_METHOD_DLADDR) + else() + sm_add_compile_definition("${SM_EXE_NAME}" BACKTRACE_LOOKUP_METHOD_BACKTRACE_SYMBOLS) + endif() endif() endif() if (${HAS_PTHREAD}) @@ -440,9 +445,9 @@ else() # Unix / Linux endif() endif() - list(APPEND SMDATA_LINK_LIB - "${DL_LIBRARY}" - ) + if (${DL_FOUND}) + list(APPEND SMDATA_LINK_LIB ${DL_LIBRARIES}) + endif() if(HAS_OGG) list(APPEND SMDATA_LINK_LIB @@ -557,6 +562,9 @@ if(NOT APPLE) if (PCRE_FOUND) list(APPEND SM_INCLUDE_DIRS "${PCRE_INCLUDE_DIR}") endif() + if (DL_FOUND) + list(APPEND SM_INCLUDE_DIRS "${DL_INCLUDE_DIR}") + endif() endif() else() if(WITH_OGG) diff --git a/src/archutils/Unix/BacktraceNames.cpp b/src/archutils/Unix/BacktraceNames.cpp index a5aee0221a..d7bb8833d5 100644 --- a/src/archutils/Unix/BacktraceNames.cpp +++ b/src/archutils/Unix/BacktraceNames.cpp @@ -42,7 +42,7 @@ void BacktraceNames::Demangle() /* demangle the name using __cxa_demangle() if needed */ if( Symbol.substr(0, 2) != "_Z" ) return; - + int status = 0; char *name = abi::__cxa_demangle( Symbol, NULL, NULL, &status ); if( name ) @@ -97,7 +97,7 @@ RString BacktraceNames::Format() const #if defined(BACKTRACE_LOOKUP_METHOD_DLADDR) /* This version simply asks libdl, which is more robust. */ #include -void BacktraceNames::FromAddr( const void *p ) +void BacktraceNames::FromAddr( void * const p ) { Address = (intptr_t) p; @@ -136,7 +136,7 @@ void BacktraceNames::FromAddr( const void *p ) /* Copyright (c) 2002 Jorge Acereda & Peter O'Gorman - + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including @@ -222,7 +222,7 @@ static const char *osx_find_link_edit( const struct mach_header *header ) return NULL; } -void BacktraceNames::FromAddr( const void *p ) +void BacktraceNames::FromAddr( void * const p ) { Address = (intptr_t) p; @@ -288,13 +288,13 @@ void BacktraceNames::FromAddr( const void *p ) */ if( Symbol.Left(9) == "_GLOBAL__" ) Symbol = Symbol.substr(11); - + } #elif defined(BACKTRACE_LOOKUP_METHOD_BACKTRACE_SYMBOLS) /* This version parses backtrace_symbols(), an doesn't need libdl. */ #include -void BacktraceNames::FromAddr( const void *p ) +void BacktraceNames::FromAddr( void * const p ) { Address = (intptr_t) p; @@ -340,120 +340,9 @@ void BacktraceNames::FromString( RString s ) } } } -#elif defined(BACKTRACE_LOOKUP_METHOD_ATOS) -void BacktraceNames::FromAddr( const void *p ) -{ - int fds[2]; - pid_t pid; - pid_t ppid = getpid(); /* Do this before fork()ing! */ - - Offset = 0; - Address = intptr_t(p); - - if (pipe(fds) != 0) - { - fprintf(stderr, "FromAddr pipe() failed: %s\n", strerror(errno)); - return; - } - - pid = fork(); - if (pid == -1) - { - fprintf(stderr, "FromAddr fork() failed: %s\n", strerror(errno)); - return; - } - - if (pid == 0) - { - close(fds[0]); - for (int fd = 3; fd < 1024; ++fd) - if (fd != fds[1]) - close(fd); - dup2(fds[1], fileno(stdout)); - close(fds[1]); - - char *addy; - asprintf(&addy, "0x%x", long(p)); - char *p; - asprintf(&p, "%d", ppid); - - execl("/usr/bin/atos", "/usr/bin/atos", "-p", p, addy, NULL); - - fprintf(stderr, "execl(atos) failed: %s\n", strerror(errno)); - free(addy); - free(p); - _exit(1); - } - - close(fds[1]); - char f[1024]; - bzero(f, 1024); - int len = read(fds[0], f, 1024); - - Symbol = ""; - File = ""; - - if (len == -1) - { - fprintf(stderr, "FromAddr read() failed: %s\n", strerror(errno)); - return; - } - vector mangledAndFile; - - split(f, " ", mangledAndFile, true); - if (mangledAndFile.size() == 0) - return; - Symbol = mangledAndFile[0]; - /* eg - * -[NSApplication run] - * +[SomeClass initialize] - */ - if (Symbol[0] == '-' || Symbol[0] == '+') - { - Symbol = mangledAndFile[0] + " " + mangledAndFile[1]; - /* eg - * (crt.c:300) - * (AppKit) - */ - if (mangledAndFile.size() == 3) - { - File = mangledAndFile[2]; - size_t pos = File.find('('); - size_t start = (pos == File.npos ? 0 : pos+1); - pos = File.rfind(')') - 1; - File = File.substr(start, pos); - } - return; - } - /* eg - * __start -> _start - * _SDL_main -> SDL_main - */ - if (Symbol[0] == '_') - Symbol = Symbol.substr(1); - - /* eg, the full line: - * __Z1Ci (in a.out) (asmtest.cc:33) - * _main (in a.out) (asmtest.cc:52) - */ - if (mangledAndFile.size() > 3) - { - File = mangledAndFile[3]; - size_t pos = File.find('('); - size_t start = (pos == File.npos ? 0 : pos+1); - pos = File.rfind(')') - 1; - File = File.substr(start, pos); - } - /* eg, the full line: - * _main (SDLMain.m:308) - * __Z8GameLoopv (crt.c:300) - */ - else if (mangledAndFile.size() == 3) - File = mangledAndFile[2].substr(0, mangledAndFile[2].rfind(')')); -} #else #warning Undefined BACKTRACE_LOOKUP_METHOD_* -void BacktraceNames::FromAddr( const void *p ) +void BacktraceNames::FromAddr( void * const p ) { Address = intptr_t(p); Offset = 0; @@ -465,7 +354,7 @@ void BacktraceNames::FromAddr( const void *p ) /* * (c) 2003-2004 Glenn Maynard * All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including @@ -475,7 +364,7 @@ void BacktraceNames::FromAddr( const void *p ) * copyright notice(s) and this permission notice appear in all copies of * the Software and that both the above copyright notice(s) and this * permission notice appear in supporting documentation. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF diff --git a/src/archutils/Unix/BacktraceNames.h b/src/archutils/Unix/BacktraceNames.h index 124519585b..4ab2824d50 100644 --- a/src/archutils/Unix/BacktraceNames.h +++ b/src/archutils/Unix/BacktraceNames.h @@ -6,7 +6,7 @@ struct BacktraceNames RString Symbol, File; intptr_t Address; int Offset; - void FromAddr( const void *p ); + void FromAddr( void * const p ); void FromString( RString str ); void Demangle(); RString Format() const; @@ -18,7 +18,7 @@ struct BacktraceNames /* * (c) 2003-2004 Glenn Maynard * All rights reserved. - * + * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the * "Software"), to deal in the Software without restriction, including @@ -28,7 +28,7 @@ struct BacktraceNames * copyright notice(s) and this permission notice appear in all copies of * the Software and that both the above copyright notice(s) and this * permission notice appear in supporting documentation. - * + * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF diff --git a/src/archutils/Unix/CrashHandlerChild.cpp b/src/archutils/Unix/CrashHandlerChild.cpp index 0be00f0aae..05ef4d6b73 100644 --- a/src/archutils/Unix/CrashHandlerChild.cpp +++ b/src/archutils/Unix/CrashHandlerChild.cpp @@ -36,26 +36,26 @@ static void output_stack_trace( FILE *out, const void **BacktracePointers ) fprintf( out, "No backtrace method available.\n"); return; } - + if( !BacktracePointers[0] ) { fprintf( out, "Backtrace was empty.\n"); return; } - + for( int i = 0; BacktracePointers[i]; ++i) { BacktraceNames bn; - bn.FromAddr( BacktracePointers[i] ); + bn.FromAddr( const_cast(BacktracePointers[i]) ); bn.Demangle(); - + /* Don't show the main module name. */ if( bn.File == g_pCrashHandlerArgv0 && !bn.Symbol.empty() ) bn.File = ""; - + if( bn.Symbol == "__libc_start_main" ) break; - + fprintf( out, "%s\n", bn.Format().c_str() ); } } @@ -74,16 +74,16 @@ bool child_read( int fd, void *p, int size ) fprintf( stderr, "Crash handler: error communicating with parent: %s\n", strerror(errno) ); return false; } - + if( ret == 0 ) { fprintf( stderr, "Crash handler: EOF communicating with parent.\n" ); return false; } - + got += ret; } - + return true; } @@ -95,7 +95,7 @@ static void child_process() CrashData crash; if( !child_read(3, &crash, sizeof(CrashData)) ) return; - + /* 2. Read info. */ int size; if( !child_read(3, &size, sizeof(size)) ) @@ -103,15 +103,15 @@ static void child_process() char *Info = new char [size]; if( !child_read(3, Info, size) ) return; - + /* 3. Read AdditionalLog. */ if( !child_read(3, &size, sizeof(size)) ) return; - + char *AdditionalLog = new char [size]; if( !child_read(3, AdditionalLog, size) ) return; - + /* 4. Read RecentLogs. */ int cnt = 0; if( !child_read(3, &cnt, sizeof(cnt)) ) @@ -125,19 +125,19 @@ static void child_process() if( !child_read(3, Recent[i], size) ) return; } - + /* 5. Read CHECKPOINTs. */ if( !child_read(3, &size, sizeof(size)) ) return; - + char *temp = new char [size]; if( !child_read(3, temp, size) ) return; - + vector Checkpoints; split(temp, "$$", Checkpoints); delete [] temp; - + /* 6. Read the crashed thread's name. */ if( !child_read(3, &size, sizeof(size)) ) return; @@ -146,15 +146,15 @@ static void child_process() return; const RString CrashedThread(temp); delete[] temp; - + /* Wait for the child to either finish cleaning up or die. */ fd_set rs; struct timeval timeout = { 5, 0 }; // 5 seconds - + FD_ZERO( &rs ); FD_SET( 3, &rs ); int ret = select( 4, &rs, NULL, NULL, &timeout ); - + if( ret == 0 ) { fputs( "Timeout exceeded.\n", stderr ); @@ -165,10 +165,10 @@ static void child_process() // Keep going. } else - { + { char x; - - // No need to check FD_ISSET( 3, &rs ) because it was the only descriptor in the set. + + // No need to check FD_ISSET( 3, &rs ) because it was the only descriptor in the set. ret = read( 3, &x, sizeof(x) ); if( ret > 0 ) { @@ -182,7 +182,7 @@ static void child_process() /* keep going */ } } - + RString sCrashInfoPath = "/tmp"; #if defined(MACOSX) sCrashInfoPath = CrashHandler::GetLogsDirectory(); @@ -192,14 +192,14 @@ static void child_process() sCrashInfoPath = home; #endif sCrashInfoPath += "/crashinfo.txt"; - + FILE *CrashDump = fopen( sCrashInfoPath, "w+" ); if(CrashDump == NULL) { fprintf( stderr, "Couldn't open " + sCrashInfoPath + ": %s\n", strerror(errno) ); exit(1); } - + fprintf( CrashDump, "%s%s crash report", PRODUCT_FAMILY, product_version ); #if defined(HAVE_VERSION_INFO) fprintf( CrashDump, " (build %s, %s @ %s)", ::sm_version_git_hash, version_date, version_time ); @@ -207,14 +207,14 @@ static void child_process() fprintf( CrashDump, "\n" ); fprintf( CrashDump, "--------------------------------------\n" ); fprintf( CrashDump, "\n" ); - + RString reason; switch( crash.type ) { case CrashData::SIGNAL: { reason = ssprintf( "%s - %s", SignalName(crash.signal), SignalCodeName(crash.signal, crash.si.si_code) ); - + /* Linux puts the PID that sent the signal in si_addr for SI_USER. */ if( crash.si.si_code == SI_USER ) { @@ -238,16 +238,16 @@ static void child_process() reason = crash.reason; break; } - + fprintf( CrashDump, "Architecture: %s\n", HOOKS->GetArchName().c_str() ); fprintf( CrashDump, "Crash reason: %s\n", reason.c_str() ); fprintf( CrashDump, "Crashed thread: %s\n\n", CrashedThread.c_str() ); - + fprintf(CrashDump, "Checkpoints:\n"); for( unsigned i=0; i