diff options
Diffstat (limited to 'klippy/util.py')
| -rw-r--r-- | klippy/util.py | 114 |
1 files changed, 74 insertions, 40 deletions
diff --git a/klippy/util.py b/klippy/util.py index 6a8baee7..43a2becc 100644 --- a/klippy/util.py +++ b/klippy/util.py @@ -11,15 +11,19 @@ import subprocess, traceback, shlex # Low-level Unix commands ###################################################################### + # Return the SIGINT interrupt handler back to the OS default def fix_sigint(): signal.signal(signal.SIGINT, signal.SIG_DFL) + + fix_sigint() + # Set a file-descriptor as non-blocking def set_nonblock(fd): - fcntl.fcntl(fd, fcntl.F_SETFL - , fcntl.fcntl(fd, fcntl.F_GETFL) | os.O_NONBLOCK) + fcntl.fcntl(fd, fcntl.F_SETFL, fcntl.fcntl(fd, fcntl.F_GETFL) | os.O_NONBLOCK) + # Clear HUPCL flag def clear_hupcl(fd): @@ -30,6 +34,7 @@ def clear_hupcl(fd): except termios.error: pass + # Support for creating a pseudo-tty for emulating a serial port def create_pty(ptyname): mfd, sfd = pty.openpty() @@ -51,6 +56,7 @@ def create_pty(ptyname): # Helper code for extracting mcu build info ###################################################################### + def dump_file_stats(build_dir, filename): fname = os.path.join(build_dir, filename) try: @@ -61,48 +67,55 @@ def dump_file_stats(build_dir, filename): except: logging.info("No build file %s", fname) + # Try to log information on the last mcu build def dump_mcu_build(): - build_dir = os.path.join(os.path.dirname(__file__), '..') + build_dir = os.path.join(os.path.dirname(__file__), "..") # Try to log last mcu config - dump_file_stats(build_dir, '.config') + dump_file_stats(build_dir, ".config") try: - f = open(os.path.join(build_dir, '.config'), 'r') - data = f.read(32*1024) + f = open(os.path.join(build_dir, ".config"), "r") + data = f.read(32 * 1024) f.close() - logging.info("========= Last MCU build config =========\n%s" - "=======================", data) + logging.info( + "========= Last MCU build config =========\n%s" "=======================", + data, + ) except: pass # Try to log last mcu build version - dump_file_stats(build_dir, 'out/klipper.dict') + dump_file_stats(build_dir, "out/klipper.dict") try: - f = open(os.path.join(build_dir, 'out/klipper.dict'), 'r') - data = f.read(32*1024) + f = open(os.path.join(build_dir, "out/klipper.dict"), "r") + data = f.read(32 * 1024) f.close() data = json.loads(data) - logging.info("Last MCU build version: %s", data.get('version', '')) - logging.info("Last MCU build tools: %s", data.get('build_versions', '')) - cparts = ["%s=%s" % (k, v) for k, v in data.get('config', {}).items()] + logging.info("Last MCU build version: %s", data.get("version", "")) + logging.info("Last MCU build tools: %s", data.get("build_versions", "")) + cparts = ["%s=%s" % (k, v) for k, v in data.get("config", {}).items()] logging.info("Last MCU build config: %s", " ".join(cparts)) except: pass - dump_file_stats(build_dir, 'out/klipper.elf') + dump_file_stats(build_dir, "out/klipper.elf") ###################################################################### # Python2 wrapper hacks ###################################################################### + def setup_python2_wrappers(): if sys.version_info.major >= 3: return # Add module hacks so that common Python3 module imports work in Python2 import ConfigParser, Queue, io, StringIO, time + sys.modules["configparser"] = ConfigParser sys.modules["queue"] = Queue io.StringIO = StringIO.StringIO time.process_time = time.clock + + setup_python2_wrappers() @@ -110,35 +123,38 @@ setup_python2_wrappers() # General system and software information ###################################################################### + def get_cpu_info(): try: - f = open('/proc/cpuinfo', 'r') + f = open("/proc/cpuinfo", "r") data = f.read() f.close() except (IOError, OSError) as e: - logging.debug("Exception on read /proc/cpuinfo: %s", - traceback.format_exc()) + logging.debug("Exception on read /proc/cpuinfo: %s", traceback.format_exc()) return "?" - lines = [l.split(':', 1) for l in data.split('\n')] + lines = [l.split(":", 1) for l in data.split("\n")] lines = [(l[0].strip(), l[1].strip()) for l in lines if len(l) == 2] core_count = [k for k, v in lines].count("processor") model_name = dict(lines).get("model name", "?") return "%d core %s" % (core_count, model_name) + def get_version_from_file(klippy_src): try: - with open(os.path.join(klippy_src, '.version')) as h: + with open(os.path.join(klippy_src, ".version")) as h: return h.read().rstrip() except IOError: pass return "?" + def _get_repo_info(gitdir): repo_info = {"branch": "?", "remote": "?", "url": "?"} - prog_branch = ('git', '-C', gitdir, 'branch', '--no-color') + prog_branch = ("git", "-C", gitdir, "branch", "--no-color") try: - process = subprocess.Popen(prog_branch, stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + process = subprocess.Popen( + prog_branch, stdout=subprocess.PIPE, stderr=subprocess.PIPE + ) branch_list, err = process.communicate() retcode = process.wait() if retcode != 0: @@ -159,9 +175,10 @@ def _get_repo_info(gitdir): repo_info["remote"] = parts[0] else: key = "branch.%s.remote" % (repo_info["branch"],) - prog_config = ('git', '-C', gitdir, 'config', '--get', key) - process = subprocess.Popen(prog_config, stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + prog_config = ("git", "-C", gitdir, "config", "--get", key) + process = subprocess.Popen( + prog_config, stdout=subprocess.PIPE, stderr=subprocess.PIPE + ) remote_info, err = process.communicate() retcode = process.wait() if retcode != 0: @@ -169,9 +186,16 @@ def _get_repo_info(gitdir): return repo_info repo_info["remote"] = str(remote_info.strip().decode()) prog_remote_url = ( - 'git', '-C', gitdir, 'remote', 'get-url', repo_info["remote"]) - process = subprocess.Popen(prog_remote_url, stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + "git", + "-C", + gitdir, + "remote", + "get-url", + repo_info["remote"], + ) + process = subprocess.Popen( + prog_remote_url, stdout=subprocess.PIPE, stderr=subprocess.PIPE + ) remote_url, err = process.communicate() retcode = process.wait() if retcode != 0: @@ -182,33 +206,43 @@ def _get_repo_info(gitdir): logging.debug("Error fetching repo info: %s", traceback.format_exc()) return repo_info + def get_git_version(from_file=True): git_info = { "version": "?", "file_status": [], "branch": "?", "remote": "?", - "url": "?" + "url": "?", } klippy_src = os.path.dirname(__file__) # Obtain version info from "git" program - gitdir = os.path.join(klippy_src, '..') - prog_desc = ('git', '-C', gitdir, 'describe', '--always', - '--tags', '--long', '--dirty') - prog_status = ('git', '-C', gitdir, 'status', '--porcelain', '--ignored') + gitdir = os.path.join(klippy_src, "..") + prog_desc = ( + "git", + "-C", + gitdir, + "describe", + "--always", + "--tags", + "--long", + "--dirty", + ) + prog_status = ("git", "-C", gitdir, "status", "--porcelain", "--ignored") try: - process = subprocess.Popen(prog_desc, stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + process = subprocess.Popen( + prog_desc, stdout=subprocess.PIPE, stderr=subprocess.PIPE + ) ver, err = process.communicate() retcode = process.wait() if retcode == 0: git_info["version"] = str(ver.strip().decode()) - process = subprocess.Popen(prog_status, stdout=subprocess.PIPE, - stderr=subprocess.PIPE) + process = subprocess.Popen( + prog_status, stdout=subprocess.PIPE, stderr=subprocess.PIPE + ) stat, err = process.communicate() - status = [l.split(None, 1) - for l in str(stat.strip().decode()).split('\n')] + status = [l.split(None, 1) for l in str(stat.strip().decode()).split("\n")] retcode = process.wait() if retcode == 0: git_info["file_status"] = status |