visionipc: support OPENPILOT_PREFIX (#497)

* OPENPILOT_PREFIX support in visionipc * Use prefix as filename prefix * Remove unnecessary import
commaai · Jul 18, 2023 · 6f71025 · 6f71025
1 parent cf9c5cb
commit 6f71025
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/visionipc/visionipc_client.cc b/visionipc/visionipc_client.cc
@@ -9,7 +9,13 @@
 #include "cereal/logger/logger.h"
 
 static int connect_to_vipc_server(const std::string &name, bool blocking) {
-  std::string path = "/tmp/visionipc_" + name;
+  char* prefix = std::getenv("OPENPILOT_PREFIX");
+  std::string path = "/tmp/";
+  if (prefix) {
+    path = path + std::string(prefix) + "_";
+  }
+  path = path + "visionipc_" + name;
+
   int socket_fd = ipc_connect(path.c_str());
   while (socket_fd < 0 && blocking) {
     std::cout << "VisionIpcClient connecting" << std::endl;

diff --git a/visionipc/visionipc_server.cc b/visionipc/visionipc_server.cc
@@ -83,7 +83,13 @@ void VisionIpcServer::start_listener(){
 void VisionIpcServer::listener(){
   std::cout << "Starting listener for: " << name << std::endl;
 
-  std::string path = "/tmp/visionipc_" + name;
+  char* prefix = std::getenv("OPENPILOT_PREFIX");
+  std::string path = "/tmp/";
+  if (prefix) {
+    path = path + std::string(prefix) + "_";
+  }
+  path = path + "visionipc_" + name;
+
   int sock = ipc_bind(path.c_str());
   assert(sock >= 0);