Browse Source

Fehler beim handeln der Threads bei linux systemen behoben

kolja 7 years ago
parent
commit
8c5485f379
3 changed files with 112 additions and 3 deletions
  1. 9 2
      Framework Linux.vcxproj
  2. 102 0
      Test.h
  3. 1 1
      Thread.cpp

+ 9 - 2
Framework Linux.vcxproj

@@ -56,10 +56,12 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <UseDebugLibraries>true</UseDebugLibraries>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <RemoteRootDir>/home/kolja/projects</RemoteRootDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <UseDebugLibraries>false</UseDebugLibraries>
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <RemoteRootDir>/home/kolja/projects</RemoteRootDir>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings" />
@@ -77,13 +79,13 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <TargetExt>.so</TargetExt>
-    <RemoteProjectDir>$(RemoteRootDir)/Framework/Debug</RemoteProjectDir>
+    <RemoteProjectDir>$(RemoteRootDir)/Framework/debug</RemoteProjectDir>
     <TargetName>libdbgFramework</TargetName>
     <IncludePath>D:\Visual Studio 2017\Common7\IDE\VC\Linux\include\usr\include\c++\5;$(IncludePath)</IncludePath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <TargetExt>.so</TargetExt>
-    <RemoteProjectDir>$(RemoteRootDir)/Framework/Release</RemoteProjectDir>
+    <RemoteProjectDir>$(RemoteRootDir)/Framework/release</RemoteProjectDir>
     <TargetName>libFramework</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
@@ -200,10 +202,15 @@
     <ClCompile>
       <CppAdditionalWarning>switch;no-deprecated-declarations;empty-body;conversion;return-type;parentheses;no-format;uninitialized;unreachable-code;unused-function;unused-value;unused-variable;%(CppAdditionalWarning)</CppAdditionalWarning>
       <AdditionalOptions>-fPIC</AdditionalOptions>
+      <PositionIndependentCode>false</PositionIndependentCode>
     </ClCompile>
     <Link>
       <AdditionalDependencies>$(StlAdditionalDependencies)</AdditionalDependencies>
       <LibraryDependencies>pthread;%(LibraryDependencies)</LibraryDependencies>
+      <GenerateMapFile>
+      </GenerateMapFile>
+      <Trace>true</Trace>
+      <TraceSymbols>test;%(TraceSymbols)</TraceSymbols>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

+ 102 - 0
Test.h

@@ -0,0 +1,102 @@
+// stacktrace.h (c) 2008, Timo Bingmann from http://idlebox.net/
+// published under the WTFPL v2.0
+
+#ifndef _STACKTRACE_H_
+#define _STACKTRACE_H_
+#include <stdio.h>
+#include <stdlib.h>
+#include <execinfo.h>
+#include <cxxabi.h>
+
+/** Print a demangled stack backtrace of the caller function to FILE* out. */
+static inline void print_stacktrace( FILE *out = stdout, unsigned int max_frames = 3 )
+{
+	fprintf( out, "stack trace:\n" );
+
+	// storage array for stack trace address data
+	void* addrlist[ max_frames + 1 ];
+
+	// retrieve current stack addresses
+	int addrlen = backtrace( addrlist, sizeof( addrlist ) / sizeof( void* ) );
+
+	if( addrlen == 0 )
+	{
+		fprintf( out, "  <empty, possibly corrupt>\n" );
+		return;
+	}
+
+	// resolve addresses into strings containing "filename(function+address)",
+	// this array must be free()-ed
+	char** symbollist = backtrace_symbols( addrlist, addrlen );
+
+	// allocate string which will be filled with the demangled function name
+	size_t funcnamesize = 256;
+	char* funcname = (char*)malloc( funcnamesize );
+
+	// iterate over the returned symbol lines. skip the first, it is the
+	// address of this function.
+	for( int i = 1; i < addrlen; i++ )
+	{
+		char *begin_name = 0, *begin_offset = 0, *end_offset = 0;
+
+		// find parentheses and +address offset surrounding the mangled name:
+		// ./module(function+0x15c) [0x8048a6d]
+		for( char *p = symbollist[ i ]; *p; ++p )
+		{
+			if( *p == '(' )
+				begin_name = p;
+			else if( *p == '+' )
+				begin_offset = p;
+			else if( *p == ')' && begin_offset )
+			{
+				end_offset = p;
+				break;
+			}
+		}
+
+		if( begin_name && begin_offset && end_offset
+			&& begin_name < begin_offset )
+		{
+			*begin_name++ = '\0';
+			*begin_offset++ = '\0';
+			*end_offset = '\0';
+
+			// mangled name is now in [begin_name, begin_offset) and caller
+			// offset in [begin_offset, end_offset). now apply
+			// __cxa_demangle():
+
+			int status;
+			char* ret = abi::__cxa_demangle( begin_name,
+											 funcname, &funcnamesize, &status );
+			if( status == 0 )
+			{
+				funcname = ret; // use possibly realloc()-ed string
+				char line[ 256 ];
+				sprintf( line, "  %s : %s+%s\n",
+						 symbollist[ i ], funcname, begin_offset );
+				int y = 0;
+			}
+			else
+			{
+				// demangling failed. Output function name as a C function with
+				// no arguments.
+				char line[ 256 ];
+				sprintf( line, "  %s : %s()+%s\n",
+						 symbollist[ i ], begin_name, begin_offset );
+				int x = 0;
+			}
+		}
+		else
+		{
+			// couldn't parse the line? print the whole line.
+			char line[ 256 ];
+			sprintf( line, "  %s\n", symbollist[ i ] );
+			int x = 0;
+		}
+	}
+
+	free( funcname );
+	free( symbollist );
+}
+
+#endif // _STACKTRACE_H_

+ 1 - 1
Thread.cpp

@@ -106,7 +106,7 @@ int Thread::warteAufThread( int zeit ) // wartet zeit lang auf den Thread
     if( pthread_self() == threadHandle )
         return 0;
     if( threadHandleSys )
-        *threadHandleSys = threadHandle;
+        *threadHandleSys = 0;
     int ret = pthread_join( threadHandle, 0 );
     threadHandle = 0;
     return ret;