Bug 5339530: Set socket creating folder to /tmp for QNX

Common/helper_multiprocess.cpp

@@ -222,10 +222,10 @@ int ipcOpenSocket(ipcHandle *&handle) {
 
   memset(&cliaddr, 0, sizeof(cliaddr));
   cliaddr.sun_family = AF_UNIX;
-  char temp[10];
+  char temp[20];
 
   // Create unique name for the socket.
-  sprintf(temp, "%u", getpid());
+  sprintf(temp, "%s%u", SOCK_FOLDER, getpid());
 
   strcpy(cliaddr.sun_path, temp);
   if (bind(sock, (struct sockaddr *)&cliaddr, sizeof(cliaddr)) < 0) {
@@ -361,8 +361,8 @@ int ipcSendShareableHandle(ipcHandle *handle,
   // Construct client address to send this SHareable handle to
   memset(&cliaddr, 0, sizeof(cliaddr));
   cliaddr.sun_family = AF_UNIX;
-  char temp[10];
+  char temp[20];
-  sprintf(temp, "%u", process);
+  sprintf(temp, "%s%u", SOCK_FOLDER, process);
   strcpy(cliaddr.sun_path, temp);
   len = sizeof(cliaddr);
 

Common/helper_multiprocess.h

@@ -54,6 +54,13 @@
 #endif
 #include <vector>
 
+// Define "/tmp" as socket creating folder for QNX
+#if defined(__QNX__)
+#define SOCK_FOLDER "/tmp/" 
+#else
+#define SOCK_FOLDER ""
+#endif
+
 typedef struct sharedMemoryInfo_st {
     void *addr;
     size_t size;

Samples/0_Introduction/matrixMulDrv/CMakeLists.txt

@@ -49,7 +49,7 @@ endforeach()
 if(CMAKE_SYSTEM_NAME STREQUAL "QNX")
     set(INCLUDES_LIST)
     foreach(dir ${CUDAToolkit_INCLUDE_DIRS})
-        list(APPEND INCLUDES_LIST "-I${dir}") 
+        list(APPEND INCLUDES_LIST "-I${dir}")
     endforeach()
     string(JOIN " " INCLUDES "${INCLUDES_LIST}")
 endif()

Samples/0_Introduction/simpleDrvRuntime/CMakeLists.txt

@@ -51,7 +51,7 @@ endforeach()
 if(CMAKE_SYSTEM_NAME STREQUAL "QNX")
     set(INCLUDES_LIST)
     foreach(dir ${CUDAToolkit_INCLUDE_DIRS})
-        list(APPEND INCLUDES_LIST "-I${dir}") 
+        list(APPEND INCLUDES_LIST "-I${dir}")
     endforeach()
     string(JOIN " " INCLUDES "${INCLUDES_LIST}")
 endif()

Samples/0_Introduction/simpleTextureDrv/CMakeLists.txt

@@ -48,7 +48,7 @@ endforeach()
 if(CMAKE_SYSTEM_NAME STREQUAL "QNX")
     set(INCLUDES_LIST)
     foreach(dir ${CUDAToolkit_INCLUDE_DIRS})
-        list(APPEND INCLUDES_LIST "-I${dir}") 
+        list(APPEND INCLUDES_LIST "-I${dir}")
     endforeach()
     string(JOIN " " INCLUDES "${INCLUDES_LIST}")
 endif()

Samples/0_Introduction/vectorAddDrv/CMakeLists.txt

@@ -48,7 +48,7 @@ endforeach()
 if(CMAKE_SYSTEM_NAME STREQUAL "QNX")
     set(INCLUDES_LIST)
     foreach(dir ${CUDAToolkit_INCLUDE_DIRS})
-        list(APPEND INCLUDES_LIST "-I${dir}") 
+        list(APPEND INCLUDES_LIST "-I${dir}")
     endforeach()
     string(JOIN " " INCLUDES "${INCLUDES_LIST}")
 endif()

Samples/2_Concepts_and_Techniques/threadMigration/CMakeLists.txt

@@ -53,7 +53,7 @@ endforeach()
 if(CMAKE_SYSTEM_NAME STREQUAL "QNX")
     set(INCLUDES_LIST)
     foreach(dir ${CUDAToolkit_INCLUDE_DIRS})
-        list(APPEND INCLUDES_LIST "-I${dir}") 
+        list(APPEND INCLUDES_LIST "-I${dir}")
     endforeach()
     string(JOIN " " INCLUDES "${INCLUDES_LIST}")
 endif()

Samples/3_CUDA_Features/cdpAdvancedQuicksort/CMakeLists.txt

@@ -17,6 +17,15 @@ else()
     set(CMAKE_CUDA_ARCHITECTURES 75 80 86 89 90 100 110 120)
 endif()
 
+set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -Wno-deprecated-gpu-targets")
+
+if(ENABLE_CUDA_DEBUG)
+    set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -G")        # enable cuda-gdb (may significantly affect performance on some targets)
+    set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -maxrregcount=64") # Limit register usage to 64 for the 'big_bitonicsort kernel
+else()
+    set(CMAKE_CUDA_FLAGS "${CMAKE_CUDA_FLAGS} -lineinfo") # add line information to all builds for debug tools (exclusive to -G option)
+endif()
+
 # Include directories and libraries
 include_directories(../../../Common)
 

Samples/3_CUDA_Features/memMapIPCDrv/CMakeLists.txt

@@ -51,7 +51,7 @@ set(CUDA_KERNEL_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/memMapIpc_kernel.cu")
 if(CMAKE_SYSTEM_NAME STREQUAL "QNX")
     set(INCLUDES_LIST)
     foreach(dir ${CUDAToolkit_INCLUDE_DIRS})
-        list(APPEND INCLUDES_LIST "-I${dir}") 
+        list(APPEND INCLUDES_LIST "-I${dir}")
     endforeach()
     string(JOIN " " INCLUDES "${INCLUDES_LIST}")
 endif()

Samples/3_CUDA_Features/ptxjit/CMakeLists.txt

@@ -44,7 +44,7 @@ set(CUDA_KERNEL_SOURCE "${CMAKE_CURRENT_SOURCE_DIR}/ptxjit_kernel.cu")
 if(CMAKE_SYSTEM_NAME STREQUAL "QNX")
     set(INCLUDES_LIST)
     foreach(dir ${CUDAToolkit_INCLUDE_DIRS})
-        list(APPEND INCLUDES_LIST "-I${dir}") 
+        list(APPEND INCLUDES_LIST "-I${dir}")
     endforeach()
     string(JOIN " " INCLUDES "${INCLUDES_LIST}")
 endif()