From 2c264ac6d6e3b6c6078d76e422d9155da0b51f67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ebbe=20Ba=C3=9F?= <ebbe.bass>
Date: Sun, 18 Feb 2024 00:59:18 +0100
Subject: [PATCH] switched from queue to shared mem
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ebbe Baß <ebbe.bass>
---
 server/app.py | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/server/app.py b/server/app.py
index dafcd2f..e888159 100644
--- a/server/app.py
+++ b/server/app.py
@@ -7,7 +7,7 @@ import os
 from getmac import get_mac_address
 import time
 import sys
-from multiprocessing import Process, Queue
+from multiprocessing import Process, shared_memory
 import asyncio
 
 app = Flask(__name__)
@@ -109,13 +109,13 @@ def connect_mqtt():
     client.connect("localhost", 1883)
     return client
 
-def mqtt_publisher(data_queue):
+def mqtt_publisher(shared_mem):
     # Create and start a thread for each universe
     mqtt_client = connect_mqtt()
     artnetBindIp = get_eth0_ip()
     artNet = Artnet.Artnet(BINDIP = artnetBindIp, DEBUG = True, SHORTNAME = "PiXelTubeMaster", LONGNAME = "PiXelTubeMaster", PORT = 6454)
     while True:
-        tube_index = data_queue.get()
+        tube_index = list(bytes(shared_mem.buf[:24]).decode())
         try:
             # Gets whatever the last Art-Net packet we received is
             artNetPacket = artNet.readPacket()
@@ -140,24 +140,24 @@ def mqtt_publisher(data_queue):
             artNet.close()
             sys.exit()
 
-def tube_index_updater(data_queue):
+def tube_index_updater(shared_mem):
     while True:
         try:
             cur = db.cursor()
             cur.execute("SELECT mac_address, universe, dmx_address FROM tubes")
             tube_index = cur.fetchall()
             cur.close()
-            data_queue.put(tube_index)
+            shared_mem.buf[:24] = str(tube_index).encode()
             print("Updated tube index with values: "+str(tube_index))
         except Exception as e:
             print(e)
         time.sleep(5)
 
 if __name__ == "__main__":
-    data_queue = Queue()
-    ti_updater_thread = Process(target=tube_index_updater, args=(data_queue, ))
+    shared_mem = shared_memory.SharedMemory(name='tube_index', size=1024, create=True)
+    ti_updater_thread = Process(target=tube_index_updater, args=(shared_mem, ))
     ti_updater_thread.start()
-    publisher_thread = Process(target=mqtt_publisher, args=(data_queue, ))
+    publisher_thread = Process(target=mqtt_publisher, args=(shared_mem, ))
     publisher_thread.start()
     flask_thread = Process(target=flask_api)
     flask_thread.start()
\ No newline at end of file