Merge pull request #145 from ndesai/feature/qnx-support

Support build with QNX 7.0 toolchain
yse · Jan 15, 2019 · 65b3b23 · 65b3b23
2 parents 0567f2d + 19237c3
commit 65b3b23
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/easy_profiler_core/CMakeLists.txt b/easy_profiler_core/CMakeLists.txt
@@ -220,9 +220,12 @@ easy_define_target_option(easy_profiler EASY_OPTION_PREDEFINED_COLORS EASY_OPTIO
 # Add platform specific compile options:
 if (UNIX)
     target_compile_options(easy_profiler PRIVATE -Wall -Wno-long-long -Wno-reorder -Wno-braced-scalar-init -pedantic)
-    if (NOT ANDROID)
+    if (NOT ANDROID AND NOT QNX)
         target_link_libraries(easy_profiler pthread)
     endif()
+    if (QNX)
+        target_link_libraries(easy_profiler socket)
+    endif()
 elseif (WIN32)
     target_compile_definitions(easy_profiler PRIVATE -D_WIN32_WINNT=0x0600 -D_CRT_SECURE_NO_WARNINGS -D_WINSOCK_DEPRECATED_NO_WARNINGS)
     target_link_libraries(easy_profiler ws2_32 psapi)

diff --git a/easy_profiler_core/current_thread.h b/easy_profiler_core/current_thread.h
@@ -50,6 +50,10 @@ The Apache License, Version 2.0 (the "License");
 #elif defined(__APPLE__)
 # include <pthread.h>
 # include <Availability.h>
+#elif defined(__QNX__)
+# include <sys/mman.h>
+# include <process.h>
+# define __NR_gettid SYS_gettid
 #else
 # include <sys/types.h>
 # include <unistd.h>
@@ -70,6 +74,9 @@ inline profiler::thread_id_t getCurrentThreadId()
 #   else
     return (profiler::thread_id_t)pthread_self();
 #   endif
+#elif defined(__QNX__)
+    EASY_THREAD_LOCAL static const profiler::thread_id_t _id = (profiler::thread_id_t)gettid();
+    return _id;
 #else
     EASY_THREAD_LOCAL static const profiler::thread_id_t _id = (profiler::thread_id_t)syscall(__NR_gettid);
     return _id;

diff --git a/easy_profiler_core/easy_socket.cpp b/easy_profiler_core/easy_socket.cpp
@@ -43,6 +43,9 @@ limitations under the License.
 #include <string.h>
 #include <thread>
 #include <limits>
+#if defined(__QNX__)
+# include <sys/time.h>
+#endif
 
 #if defined(_WIN32)
 # pragma comment (lib, "Ws2_32.lib")