Merge pull request #527 from bjackman/dmesg-fix

Dmesg instrument fixes

Author: setrofim

wa/instrumentation/dmesg.py

@@ -44,8 +44,8 @@ def initialize(self, context):
 
     def setup(self, context):
         if self.loglevel:
-            self.old_loglevel = self.target.get_sysfile_value(self.loglevel_file)
-            self.target.set_sysfile_value(self.loglevel_file, self.loglevel, verify=False)
+            self.old_loglevel = self.target.read_int(self.loglevel_file)
+            self.target.write_value(self.loglevel_file, self.loglevel, verify=False)
         self.before_file = _f(os.path.join(context.output_directory, 'dmesg', 'before'))
         self.after_file = _f(os.path.join(context.output_directory, 'dmesg', 'after'))
 
@@ -57,11 +57,12 @@ def start(self, context):
         if self.target.is_rooted:
             self.target.execute('dmesg -c', as_root=True)
 
+    @slow
     def stop(self, context):
         with open(self.after_file, 'w') as wfh:
             wfh.write(self.target.execute('dmesg', as_root=self.need_root))
         context.add_artifact('dmesg_after', self.after_file, kind='data')
 
     def teardown(self, context):  # pylint: disable=unused-argument
         if self.loglevel:
-            self.target.set_sysfile_value(self.loglevel_file, self.old_loglevel, verify=False)
+            self.target.write_value(self.loglevel_file, self.old_loglevel, verify=False)