From 21cf3f557ee2b6a07d2ad0d6507d404f1c8f5104 Mon Sep 17 00:00:00 2001
From: George Hotz <geohot@gmail.com>
Date: Sat, 14 Dec 2019 19:34:01 -0800
Subject: [PATCH] build on mac

---
 .gitignore          |  2 +-
 SConscript          |  4 ++--
 messaging/bridge.cc |  2 ++
 messaging/msgq.cc   | 14 +++++++++++---
 4 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5053090f144df5..e90f8c750f9b26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,5 +10,5 @@ libmessaging.*
 libmessaging_shared.*
 services.h
 .sconsign.dblite
-libcereal_shared.so
+libcereal_shared.*
 
diff --git a/SConscript b/SConscript
index 789e83023a078c..e0c1b2b52c16a4 100644
--- a/SConscript
+++ b/SConscript
@@ -29,7 +29,7 @@ cereal_objects = env.SharedObject([
   ])
 
 env.Library('cereal', cereal_objects)
-env.SharedLibrary('cereal_shared', cereal_objects)
+env.SharedLibrary('cereal_shared', cereal_objects, LIBS=["capnp_c"])
 
 cereal_dir = Dir('.')
 services_h = env.Command(
@@ -49,7 +49,7 @@ Depends('messaging/impl_zmq.cc', services_h)
 
 # note, this rebuilds the deps shared, zmq is statically linked to make APK happy
 # TODO: get APK to load system zmq to remove the static link
-shared_lib_shared_lib = [zmq, 'm', 'stdc++'] + ["gnustl_shared"] if arch == "aarch64" else []
+shared_lib_shared_lib = [zmq, 'm', 'stdc++'] + ["gnustl_shared"] if arch == "aarch64" else [zmq]
 env.SharedLibrary('messaging_shared', messaging_objects, LIBS=shared_lib_shared_lib)
 
 env.Program('messaging/bridge', ['messaging/bridge.cc'], LIBS=[messaging_lib, 'zmq'])
diff --git a/messaging/bridge.cc b/messaging/bridge.cc
index 7abcdd09dae6e0..8e29566ca26c64 100644
--- a/messaging/bridge.cc
+++ b/messaging/bridge.cc
@@ -4,6 +4,8 @@
 #include <csignal>
 #include <map>
 
+typedef void (*sighandler_t)(int sig);
+
 #include "services.h"
 
 #include "impl_msgq.hpp"
diff --git a/messaging/msgq.cc b/messaging/msgq.cc
index 380b9c7fe6aee2..e185b65e69663a 100644
--- a/messaging/msgq.cc
+++ b/messaging/msgq.cc
@@ -150,6 +150,15 @@ void msgq_init_publisher(msgq_queue_t * q) {
   q->write_uid_local = uid;
 }
 
+static void thread_signal(uint32_t tid) {
+  #ifndef SYS_tkill
+    // TODO: this won't work for multithreaded programs
+    kill(tid, SIGUSR1);
+  #else
+    syscall(SYS_tkill, tid, SIGUSR1);
+  #endif
+}
+
 void msgq_init_subscriber(msgq_queue_t * q) {
   assert(q != NULL);
   assert(q->num_readers != NULL);
@@ -173,7 +182,7 @@ void msgq_init_subscriber(msgq_queue_t * q) {
         *q->read_uids[i] = 0;
 
         // Wake up reader in case they are in a poll
-        syscall(SYS_tkill, old_uid & 0xFFFFFFFF, SIGUSR1);
+        thread_signal(old_uid & 0xFFFFFFFF);
       }
 
       continue;
@@ -278,8 +287,7 @@ int msgq_msg_send(msgq_msg_t * msg, msgq_queue_t *q){
   // Notify readers
   for (uint64_t i = 0; i < num_readers; i++){
     uint64_t reader_uid = *q->read_uids[i];
-
-    syscall(SYS_tkill, reader_uid & 0xFFFFFFFF, SIGUSR1);
+    thread_signal(reader_uid & 0xFFFFFFFF);
   }
 
   return msg->size;