From 2ebf4ccb89361d926c62153519d72bea2391e39d Mon Sep 17 00:00:00 2001
From: Marko Mecina <marko.mecina@univie.ac.at>
Date: Tue, 28 Jan 2025 14:20:19 +0100
Subject: [PATCH] update communications module
---
Ccs/.ipycfg.py | 3 +++
Ccs/.ipyloadcfg.py | 3 ---
Ccs/communication.py | 8 ++++++--
3 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/Ccs/.ipycfg.py b/Ccs/.ipycfg.py
index d7159ac..d4bdfd0 100644
--- a/Ccs/.ipycfg.py
+++ b/Ccs/.ipycfg.py
@@ -4,3 +4,6 @@ gi.require_version('Gtk', '3.0')
# disable autosuggest in IPython >= 8
# c = get_config()
# c.TerminalInteractiveShell.autosuggestions_provider = None
+# c.TerminalInteractiveShell.highlighting_style = 'friendly'
+# c.TerminalInteractiveShell.colors = 'neutral'
+
diff --git a/Ccs/.ipyloadcfg.py b/Ccs/.ipyloadcfg.py
index 61b4370..1754e19 100644
--- a/Ccs/.ipyloadcfg.py
+++ b/Ccs/.ipyloadcfg.py
@@ -3,7 +3,6 @@
import sys
import io
import os
-# import gi
import dbus
import dbus.service
import logging
@@ -11,8 +10,6 @@ import ccs_function_lib as cfl
sys.path.append(cfl.cfg.get('paths', 'ccs'))
-# gi.require_version('Gtk', '3.0')
-
# import confignator
# cfg = confignator.get_config(check_interpolation=False)
diff --git a/Ccs/communication.py b/Ccs/communication.py
index 024d35e..063028a 100644
--- a/Ccs/communication.py
+++ b/Ccs/communication.py
@@ -227,14 +227,13 @@ class Receiver:
SEL_TIMEOUT = 2
RECV_BUF_SIZE = 1024**3
- def __init__(self, sockfds, procfunc=None, recv_buf_size=RECV_BUF_SIZE, outfile=None, ofmode='w', pkt_parser_func=None, extend_processed=True):
+ def __init__(self, sockfds, procfunc=None, recv_buf_size=RECV_BUF_SIZE, outfile=None, ofmode='w', pkt_parser_func=None, extend_processed=True, procdata=None):
self.sockfds = sockfds
self.recvd_data_buf = queue.Queue(recv_buf_size)
self._procfunc = procfunc
self._recv_thread = None
self._proc_thread = None
- self.proc_data = []
self.extend_processed = extend_processed
self._pkt_parser_func = pkt_parser_func
@@ -243,6 +242,11 @@ class Receiver:
else:
self.proc_data_fd = None
+ if procdata is not None:
+ self.proc_data = procdata
+ else:
+ self.proc_data = []
+
self._isrunning = False
def start(self):
--
GitLab