| Message ID | e9f569408b3debe4b39e5ee9e2671e5d68bce00f.1546594044.git.echaudro@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [ovs-dev,1/1] utilities: Update gdb script so it works with all python versions | expand |
Eelco Chaudron wrote: > Newer versions of Python require a different iterator function. This > change will make the iterator classes work with all Python versions. Another error is happened when using ovs_dump_udpif_keys command. The error message is like: "Error: name 'long' is not defined" GDB parses python scripts with python3, so need to replace "long" to "int" also.
Thanks Solomon for testing it on Python3! I’ve built a Python3 setup, and tested it, and a v2 was sent. //Eelco On 4 Jan 2019, at 10:55, solomon wrote: > Eelco Chaudron wrote: >> Newer versions of Python require a different iterator function. This >> change will make the iterator classes work with all Python versions. > > Another error is happened when using ovs_dump_udpif_keys command. > > The error message is like: > "Error: name 'long' is not defined" > > GDB parses python scripts with python3, so need to replace "long" to > "int" also. > > -- > Thanks > Solomon > > >> >> Signed-off-by: Eelco Chaudron <echaudro@redhat.com> >> --- >> utilities/gdb/ovs_gdb.py | 41 >> ++++++++++++++++++++++++++++++---------- >> 1 file changed, 31 insertions(+), 10 deletions(-) >> >> diff --git a/utilities/gdb/ovs_gdb.py b/utilities/gdb/ovs_gdb.py >> index cb9778c69..244be2661 100644 >> --- a/utilities/gdb/ovs_gdb.py >> +++ b/utilities/gdb/ovs_gdb.py >> @@ -192,7 +192,7 @@ class ForEachCMAP(object): >> >> raise StopIteration >> >> - def next(self): >> + def __next__(self): >> ipml = self.cmap['impl']['p'] >> if ipml['n'] == 0: >> raise StopIteration >> @@ -206,6 +206,9 @@ class ForEachCMAP(object): >> gdb.lookup_type(self.typeobj).pointer(), >> self.member) >> >> + def next(self): >> + return self.__next__() >> + >> >> # >> # Class that will provide an iterator over an OVS hmap. >> @@ -229,7 +232,7 @@ class ForEachHMAP(object): >> >> raise StopIteration >> >> - def next(self): >> + def __next__(self): >> # >> # In the real implementation the n values is never checked, >> # however when debugging we do, as we might try to access >> @@ -253,6 +256,9 @@ class ForEachHMAP(object): >> gdb.lookup_type(self.typeobj).pointer(), >> self.member) >> >> + def next(self): >> + return self.__next__() >> + >> >> # >> # Class that will provide an iterator over an Netlink attributes >> @@ -268,7 +274,7 @@ class ForEachNL(): >> def round_up(self, val, round_to): >> return int(val) + (round_to - int(val)) % round_to >> >> - def next(self): >> + def __next__(self): >> if self.attr is None or \ >> self.attr_len < 4 or self.attr['nla_len'] < 4 or \ >> self.attr['nla_len'] > self.attr_len: >> @@ -286,6 +292,9 @@ class ForEachNL(): >> >> return attr >> >> + def next(self): >> + return self.__next__() >> + >> >> # >> # Class that will provide an iterator over an OVS shash. >> @@ -298,14 +307,17 @@ class ForEachSHASH(ForEachHMAP): >> super(ForEachSHASH, self).__init__(shash['map'], >> "struct shash_node", >> "node") >> >> - def next(self): >> - node = super(ForEachSHASH, self).next() >> + def __next__(self): >> + node = super(ForEachSHASH, self).__next__() >> >> if self.data_typeobj is None: >> return node >> >> return >> node['data'].cast(gdb.lookup_type(self.data_typeobj).pointer()) >> >> + def next(self): >> + return self.__next__() >> + >> >> # >> # Class that will provide an iterator over an OVS simap. >> @@ -315,10 +327,13 @@ class ForEachSIMAP(ForEachHMAP): >> super(ForEachSIMAP, self).__init__(shash['map'], >> "struct simap_node", >> "node") >> >> - def next(self): >> - node = super(ForEachSIMAP, self).next() >> + def __next__(self): >> + node = super(ForEachSIMAP, self).__next__() >> return node['name'], node['data'] >> >> + def next(self): >> + return self.__next__() >> + >> >> # >> # Class that will provide an iterator over an OVS smap. >> @@ -328,10 +343,13 @@ class ForEachSMAP(ForEachHMAP): >> super(ForEachSMAP, self).__init__(shash['map'], >> "struct smap_node", >> "node") >> >> - def next(self): >> - node = super(ForEachSMAP, self).next() >> + def __next__(self): >> + node = super(ForEachSMAP, self).__next__() >> return node['key'], node['value'] >> >> + def next(self): >> + return self.__next__() >> + >> >> # >> # Class that will provide an iterator over an OVS list. >> @@ -346,7 +364,7 @@ class ForEachLIST(): >> def __iter__(self): >> return self >> >> - def next(self): >> + def __next__(self): >> if self.list.address == self.node['next']: >> raise StopIteration >> >> @@ -359,6 +377,9 @@ class ForEachLIST(): >> gdb.lookup_type(self.typeobj).pointer(), >> self.member) >> >> + def next(self): >> + return self.__next__() >> + >> >> # >> # Implements the GDB "ovs_dump_bridges" command >>
diff --git a/utilities/gdb/ovs_gdb.py b/utilities/gdb/ovs_gdb.py index cb9778c69..244be2661 100644 --- a/utilities/gdb/ovs_gdb.py +++ b/utilities/gdb/ovs_gdb.py @@ -192,7 +192,7 @@ class ForEachCMAP(object): raise StopIteration - def next(self): + def __next__(self): ipml = self.cmap['impl']['p'] if ipml['n'] == 0: raise StopIteration @@ -206,6 +206,9 @@ class ForEachCMAP(object): gdb.lookup_type(self.typeobj).pointer(), self.member) + def next(self): + return self.__next__() + # # Class that will provide an iterator over an OVS hmap. @@ -229,7 +232,7 @@ class ForEachHMAP(object): raise StopIteration - def next(self): + def __next__(self): # # In the real implementation the n values is never checked, # however when debugging we do, as we might try to access @@ -253,6 +256,9 @@ class ForEachHMAP(object): gdb.lookup_type(self.typeobj).pointer(), self.member) + def next(self): + return self.__next__() + # # Class that will provide an iterator over an Netlink attributes @@ -268,7 +274,7 @@ class ForEachNL(): def round_up(self, val, round_to): return int(val) + (round_to - int(val)) % round_to - def next(self): + def __next__(self): if self.attr is None or \ self.attr_len < 4 or self.attr['nla_len'] < 4 or \ self.attr['nla_len'] > self.attr_len: @@ -286,6 +292,9 @@ class ForEachNL(): return attr + def next(self): + return self.__next__() + # # Class that will provide an iterator over an OVS shash. @@ -298,14 +307,17 @@ class ForEachSHASH(ForEachHMAP): super(ForEachSHASH, self).__init__(shash['map'], "struct shash_node", "node") - def next(self): - node = super(ForEachSHASH, self).next() + def __next__(self): + node = super(ForEachSHASH, self).__next__() if self.data_typeobj is None: return node return node['data'].cast(gdb.lookup_type(self.data_typeobj).pointer()) + def next(self): + return self.__next__() + # # Class that will provide an iterator over an OVS simap. @@ -315,10 +327,13 @@ class ForEachSIMAP(ForEachHMAP): super(ForEachSIMAP, self).__init__(shash['map'], "struct simap_node", "node") - def next(self): - node = super(ForEachSIMAP, self).next() + def __next__(self): + node = super(ForEachSIMAP, self).__next__() return node['name'], node['data'] + def next(self): + return self.__next__() + # # Class that will provide an iterator over an OVS smap. @@ -328,10 +343,13 @@ class ForEachSMAP(ForEachHMAP): super(ForEachSMAP, self).__init__(shash['map'], "struct smap_node", "node") - def next(self): - node = super(ForEachSMAP, self).next() + def __next__(self): + node = super(ForEachSMAP, self).__next__() return node['key'], node['value'] + def next(self): + return self.__next__() + # # Class that will provide an iterator over an OVS list. @@ -346,7 +364,7 @@ class ForEachLIST(): def __iter__(self): return self - def next(self): + def __next__(self): if self.list.address == self.node['next']: raise StopIteration @@ -359,6 +377,9 @@ class ForEachLIST(): gdb.lookup_type(self.typeobj).pointer(), self.member) + def next(self): + return self.__next__() + # # Implements the GDB "ovs_dump_bridges" command
Newer versions of Python require a different iterator function. This change will make the iterator classes work with all Python versions. Signed-off-by: Eelco Chaudron <echaudro@redhat.com> --- utilities/gdb/ovs_gdb.py | 41 ++++++++++++++++++++++++++++++---------- 1 file changed, 31 insertions(+), 10 deletions(-)