klipper update

klippy/util.py

@@ -0,0 +1,157 @@
+# Low level unix utility functions
+#
+# Copyright (C) 2016-2020  Kevin O'Connor <kevin@koconnor.net>
+#
+# This file may be distributed under the terms of the GNU GPLv3 license.
+import sys, os, pty, fcntl, termios, signal, logging, json, time
+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)
+
+# Clear HUPCL flag
+def clear_hupcl(fd):
+    attrs = termios.tcgetattr(fd)
+    attrs[2] = attrs[2] & ~termios.HUPCL
+    try:
+        termios.tcsetattr(fd, termios.TCSADRAIN, attrs)
+    except termios.error:
+        pass
+
+# Support for creating a pseudo-tty for emulating a serial port
+def create_pty(ptyname):
+    mfd, sfd = pty.openpty()
+    try:
+        os.unlink(ptyname)
+    except os.error:
+        pass
+    filename = os.ttyname(sfd)
+    os.chmod(filename, 0o660)
+    os.symlink(filename, ptyname)
+    set_nonblock(mfd)
+    old = termios.tcgetattr(mfd)
+    old[3] = old[3] & ~termios.ECHO
+    termios.tcsetattr(mfd, termios.TCSADRAIN, old)
+    return mfd
+
+
+######################################################################
+# Helper code for extracting mcu build info
+######################################################################
+
+def dump_file_stats(build_dir, filename):
+    fname = os.path.join(build_dir, filename)
+    try:
+        mtime = os.path.getmtime(fname)
+        fsize = os.path.getsize(fname)
+        timestr = time.asctime(time.localtime(mtime))
+        logging.info("Build file %s(%d): %s", fname, fsize, timestr)
+    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__), '..')
+    # Try to log last mcu config
+    dump_file_stats(build_dir, '.config')
+    try:
+        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)
+    except:
+        pass
+    # Try to log last mcu build version
+    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.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 config: %s", " ".join(cparts))
+    except:
+        pass
+    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()
+
+
+######################################################################
+# General system and software information
+######################################################################
+
+def get_cpu_info():
+    try:
+        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())
+        return "?"
+    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:
+            return h.read().rstrip()
+    except IOError:
+        pass
+    return "?"
+
+def get_git_version(from_file=True):
+    klippy_src = os.path.dirname(__file__)
+
+    # Obtain version info from "git" program
+    gitdir = os.path.join(klippy_src, '..')
+    prog = ('git', '-C', gitdir, 'describe', '--always',
+            '--tags', '--long', '--dirty')
+    try:
+        process = subprocess.Popen(prog, stdout=subprocess.PIPE,
+                                   stderr=subprocess.PIPE)
+        ver, err = process.communicate()
+        retcode = process.wait()
+        if retcode == 0:
+            return str(ver.strip().decode())
+        else:
+            logging.debug("Error getting git version: %s", err)
+    except:
+        logging.debug("Exception on run: %s", traceback.format_exc())
+
+    if from_file:
+        return get_version_from_file(klippy_src)
+    return "?"