Make running Focaccia with multithreading possible

1 files changed, 7 insertions, 2 deletions

diff --git a/src/focaccia/qemu/target.py b/src/focaccia/qemu/target.py
index c934b42..3877bcc 100644
--- a/src/focaccia/qemu/target.py
+++ b/src/focaccia/qemu/target.py
@@ -1,5 +1,6 @@
 import re
 import gdb
+import socket
 import logging
 from typing import Optional
 
@@ -24,6 +25,8 @@ debug = logger.debug
 info = logger.info
 warn = logger.warning
 
+DEST = "/tmp/memcached_scheduler.sock"
+
 def match_event(event: Event, target: ReadableProgramState) -> bool:
     # Match just on PC
     debug(f'Matching for PC {hex(target.read_pc())} with event {hex(event.pc)}')
@@ -218,6 +221,8 @@ class GDBServerConnector:
 
 class GDBServerStateIterator(GDBServerConnector):
     def __init__(self, remote: str, deterministic_log: DeterministicLog):
+        self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
+        self.sock.connect(DEST)
         super().__init__(remote)
 
         self._deterministic_log = deterministic_log
@@ -328,7 +333,7 @@ class GDBServerStateIterator(GDBServerConnector):
                 self._thread_context[self._current_event_id] = event
                 self._current_event_id = post_event.tid
                 tid, num = self._thread_map[self._current_event_id]
-                self.context_switch(num)
+                self.context_switch(tid)
                 state = self.current_state()
                 debug(f'Scheduled {hex(tid)} that corresponds to native {hex(post_event.tid)}')
 
@@ -402,5 +407,5 @@ class GDBServerStateIterator(GDBServerConnector):
         return GDBProgramState(self._process, gdb.selected_frame(), self.arch)
 
     def context_switch(self, thread_number: int) -> None:
-        gdb.execute(f'thread {thread_number}')
+        self.sock.send(bytes([thread_number]))