]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
pm-graph: make setVal unbuffered again for python2 and python3
authorTodd Brandt <todd.e.brandt@linux.intel.com>
Wed, 4 Sep 2019 21:04:52 +0000 (14:04 -0700)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Wed, 4 Sep 2019 21:10:26 +0000 (23:10 +0200)
sleepgraph:
 - kprobe_events won't set correctly if the data is buffered
 - force sysvals.setVal to be unbuffered and use binary mode
 - tested in both python2 and python3

Link: https://bugzilla.kernel.org/show_bug.cgi?id=204773
Signed-off-by: Todd Brandt <todd.e.brandt@linux.intel.com>
[ rjw: Subject ]
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
tools/power/pm-graph/sleepgraph.py

index 1794c79a7d1b6ff11145d9c520dc9447414f81f8..f7d1c1f62f860b18b37749bdff0aff2e40dc9ec8 100755 (executable)
@@ -667,19 +667,19 @@ class SystemValues:
                if linesack < linesout:
                        return False
                return True
-       def setVal(self, val, file, mode='w'):
+       def setVal(self, val, file):
                if not os.path.exists(file):
                        return False
                try:
-                       fp = open(file, mode)
-                       fp.write(val)
+                       fp = open(file, 'wb', 0)
+                       fp.write(val.encode())
                        fp.flush()
                        fp.close()
                except:
                        return False
                return True
-       def fsetVal(self, val, path, mode='w'):
-               return self.setVal(val, self.tpath+path, mode)
+       def fsetVal(self, val, path):
+               return self.setVal(val, self.tpath+path)
        def getVal(self, file):
                res = ''
                if not os.path.exists(file):