lorenz.stechauner/BSc-Thesis
1
0
Fork 0
Code Activity

proj: Add pid to msg()

Browse Source
This commit is contained in:
Lorenz Stechauner
2025-04-14 17:05:40 +02:00
parent a738e3ee2b
commit e851f5b90d
5 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proj/intercept/src/intercept.c
View File

@@ -602,7 +602,7 @@ static void msg(const char *fmt, ...) {
struct timespec spec;
clock_gettime(CLOCK_REALTIME, &spec);
size_t offset = snprintf(buf, sizeof(buf), "%li.%09li ", spec.tv_sec, spec.tv_nsec);
size_t offset = snprintf(buf, sizeof(buf), "%li.%09li %i ", spec.tv_sec, spec.tv_nsec, getpid());
for (char ch, state = 0; (ch = *fmt) != 0 && offset < sizeof(buf); fmt++) {
if (state == '%') {
if (ch == '%') {

4
proj/server/src/intercept/__init__.py
View File

@@ -38,7 +38,7 @@ class Handler(StreamRequestHandler):
def handle(self):
first = self.rfile.readline()
meta = {a[0]: a[1] for a in [tuple(p.decode('utf-8').split(':', 1)) for p in first.split(b' ', 1)[1].strip().split(b';')]}
meta = {a[0]: a[1] for a in [tuple(p.decode('utf-8').split(':', 1)) for p in first.split(b' ', 2)[2].strip().split(b';')]}
self.pid = int(meta['PID']) if 'PID' in meta else None
self.path = meta['PATH'] if 'PATH' in meta else None
self.stack = []
@@ -163,7 +163,7 @@ class Handler(StreamRequestHandler):
return tuple(args), idx
def handle_msg(self, msg: bytes):
timestamp, data = msg.rstrip(b'\n').split(b' ', 1)
timestamp, pid, data = msg.rstrip(b'\n').split(b' ', 2)
if not data.startswith(b'return ') and not data == b'return':
call = data.decode('utf-8')
print(f'[{self.pid}] {call}')

5
proj/server/src/test-interrupts
View File

@@ -21,7 +21,10 @@ def main() -> None:
t1 = threading.Thread(target=socket_thread, args=(socket_name,))
t1.daemon = True
t1.start()
subprocess.run(extra, env={'LD_PRELOAD': os.getcwd() + '/../../intercept/intercept.so', 'INTERCEPT': 'unix:' + socket_name})
subprocess.run(extra, env={
'LD_PRELOAD': os.getcwd() + '/../../intercept/intercept.so',
'INTERCEPT': 'unix:' + socket_name,
})
if __name__ == '__main__':

6
proj/server/src/test-memory
View File

@@ -21,7 +21,11 @@ def main() -> None:
t1 = threading.Thread(target=socket_thread, args=(socket_name,))
t1.daemon = True
t1.start()
subprocess.run(extra, env={'LD_PRELOAD': os.getcwd() + '/../../intercept/intercept.so', 'INTERCEPT': 'unix:' + socket_name})
subprocess.run(extra, env={
'LD_PRELOAD': os.getcwd() + '/../../intercept/intercept.so',
'INTERCEPT': 'unix:' + socket_name,
'INTERCEPT_FUNCTIONS': ','.join(['malloc', 'calloc', 'realloc', 'reallocarray', 'free']),
})
if __name__ == '__main__':

5
proj/server/src/test-return-values
View File

@@ -32,7 +32,10 @@ def main() -> None:
while ctx['state'] != 'finished':
if stdin:
stdin.seek(0, 0)
subprocess.run(extra, stdin=stdin, env={'LD_PRELOAD': os.getcwd() + '/../../intercept/intercept.so', 'INTERCEPT': 'unix:' + socket_name})
subprocess.run(extra, stdin=stdin, env={
'LD_PRELOAD': os.getcwd() + '/../../intercept/intercept.so',
'INTERCEPT': 'unix:' + socket_name,
})
for i, name in enumerate(ctx['call_sequence']):
errors = [r[1] for r in ctx['results'] if r[0] == i]
results = [ctx['results'][(i, e)] for e in errors]