Browse Source

scripts/gdb: port to python3 / gdb7.7

I tried to use these scripts in an ubuntu 14.04 host (gdb 7.7 compiled
against python 3.3) but there were several errors.

I believe this patch fixes these issues so that the commands now work (I
tested lx-symbols, lx-dmesg, lx-lsmod).

Main issues that needed to be resolved:

  * In python 2 iterators have a "next()" method. In python 3 it is
    __next__() instead (so let's just add both).

  * In older python versions there was an implicit conversion
    in object.__format__() (used when an object is in string.format())
    where it was converting the object to str first and then
    calling str's __format__(). This has now been removed so
    we must explicitly convert to str the objects for which
    we need to keep this behavior.

  * In dmesg.py: in python 3 log_buf is now a "memoryview" object
    which needs to be converted to a string in order to use string
    methods like "splitlines()". Luckily memoryview exists in
    python 2.7.6 as well, so we can convert log_buf to memoryview
    and use the same code in both python 2 and python 3.

This version of the patch has now been tested with gdb 7.7 and both python
3.4 and python 2.7.6 (I think asking for at least python 2.7.6 is a
reasonable requirement instead of complicating the code with version
checks etc).

Signed-off-by: Pantelis Koukousoulas <pktoss@gmail.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Wessel <jason.wessel@windriver.com>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Ben Widawsky <ben@bwidawsk.net>
Cc: Borislav Petkov <bp@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Pantelis Koukousoulas 10 years ago
parent
commit
276d97d90a

+ 4 - 1
scripts/gdb/linux/cpus.py

@@ -82,7 +82,7 @@ class CpuList():
     def __iter__(self):
     def __iter__(self):
         return self
         return self
 
 
-    def next(self):
+    def __next__(self):
         while self.bits == 0:
         while self.bits == 0:
             self.entry += 1
             self.entry += 1
             if self.entry == self.num_entries:
             if self.entry == self.num_entries:
@@ -103,6 +103,9 @@ class CpuList():
 
 
         return cpu
         return cpu
 
 
+    def next(self):
+        return self.__next__()
+
 
 
 class PerCpu(gdb.Function):
 class PerCpu(gdb.Function):
     """Return per-cpu variable.
     """Return per-cpu variable.

+ 2 - 1
scripts/gdb/linux/dmesg.py

@@ -51,9 +51,10 @@ class LxDmesg(gdb.Command):
                 continue
                 continue
 
 
             text_len = utils.read_u16(log_buf[pos + 10:pos + 12])
             text_len = utils.read_u16(log_buf[pos + 10:pos + 12])
+            text = log_buf[pos + 16:pos + 16 + text_len]
             time_stamp = utils.read_u64(log_buf[pos:pos + 8])
             time_stamp = utils.read_u64(log_buf[pos:pos + 8])
 
 
-            for line in log_buf[pos + 16:pos + 16 + text_len].splitlines():
+            for line in memoryview(text).tobytes().splitlines():
                 gdb.write("[{time:12.6f}] {line}\n".format(
                 gdb.write("[{time:12.6f}] {line}\n".format(
                     time=time_stamp / 1000000000.0,
                     time=time_stamp / 1000000000.0,
                     line=line))
                     line=line))

+ 6 - 3
scripts/gdb/linux/modules.py

@@ -30,7 +30,7 @@ class ModuleList:
     def __iter__(self):
     def __iter__(self):
         return self
         return self
 
 
-    def next(self):
+    def __next__(self):
         entry = self.curr_entry
         entry = self.curr_entry
         if entry != self.end_of_list:
         if entry != self.end_of_list:
             self.curr_entry = entry['next']
             self.curr_entry = entry['next']
@@ -38,6 +38,9 @@ class ModuleList:
         else:
         else:
             raise StopIteration
             raise StopIteration
 
 
+    def next(self):
+        return self.__next__()
+
 
 
 def find_module_by_name(name):
 def find_module_by_name(name):
     for module in ModuleList():
     for module in ModuleList():
@@ -91,8 +94,8 @@ class LxLsmod(gdb.Command):
             gdb.write("{address} {name:<19} {size:>8}  {ref}".format(
             gdb.write("{address} {name:<19} {size:>8}  {ref}".format(
                 address=str(module['module_core']).split()[0],
                 address=str(module['module_core']).split()[0],
                 name=module['name'].string(),
                 name=module['name'].string(),
-                size=module['core_size'],
-                ref=ref))
+                size=str(module['core_size']),
+                ref=str(ref)))
 
 
             source_list = module['source_list']
             source_list = module['source_list']
             t = self._module_use_type.get_type().pointer()
             t = self._module_use_type.get_type().pointer()

+ 2 - 2
scripts/gdb/linux/symbols.py

@@ -73,7 +73,7 @@ lx-symbols command."""
 
 
     def _get_module_file(self, module_name):
     def _get_module_file(self, module_name):
         module_pattern = ".*/{0}\.ko$".format(
         module_pattern = ".*/{0}\.ko$".format(
-            string.replace(module_name, "_", r"[_\-]"))
+            module_name.replace("_", r"[_\-]"))
         for name in self.module_files:
         for name in self.module_files:
             if re.match(module_pattern, name) and os.path.exists(name):
             if re.match(module_pattern, name) and os.path.exists(name):
                 return name
                 return name
@@ -87,7 +87,7 @@ lx-symbols command."""
         attrs = sect_attrs['attrs']
         attrs = sect_attrs['attrs']
         section_name_to_address = {
         section_name_to_address = {
             attrs[n]['name'].string() : attrs[n]['address']
             attrs[n]['name'].string() : attrs[n]['address']
-            for n in range(sect_attrs['nsections'])}
+            for n in range(int(sect_attrs['nsections']))}
         args = []
         args = []
         for section_name in [".data", ".data..read_mostly", ".rodata", ".bss"]:
         for section_name in [".data", ".data..read_mostly", ".rodata", ".bss"]:
             address = section_name_to_address.get(section_name)
             address = section_name_to_address.get(section_name)

+ 3 - 1
scripts/gdb/linux/tasks.py

@@ -30,7 +30,7 @@ class TaskList:
     def __iter__(self):
     def __iter__(self):
         return self
         return self
 
 
-    def next(self):
+    def __next__(self):
         t = self.curr_task
         t = self.curr_task
         if not t or t == self.curr_group:
         if not t or t == self.curr_group:
             self.curr_group = \
             self.curr_group = \
@@ -45,6 +45,8 @@ class TaskList:
                                    self.task_ptr_type, "thread_group")
                                    self.task_ptr_type, "thread_group")
         return t
         return t
 
 
+    def next(self):
+        return self.__next__()
 
 
 def get_task_by_pid(pid):
 def get_task_by_pid(pid):
     for task in TaskList():
     for task in TaskList():

+ 1 - 1
scripts/gdb/linux/utils.py

@@ -83,7 +83,7 @@ def get_target_endianness():
         elif "big endian" in endian:
         elif "big endian" in endian:
             target_endianness = BIG_ENDIAN
             target_endianness = BIG_ENDIAN
         else:
         else:
-            raise gdb.GdgError("unknown endianness '{0}'".format(endian))
+            raise gdb.GdgError("unknown endianness '{0}'".format(str(endian)))
     return target_endianness
     return target_endianness