Skip to content

dbuf command filtering does not work in all invocations #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 25, 2020
Merged

dbuf command filtering does not work in all invocations #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2974624
dbuf command filtering does not work in all invocations
ahrens Feb 21, 2020
aa1f8b8
Merge branch 'master' into dbuf
ahrens Feb 25, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion sdb/commands/zfs/dbuf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def ObjsetName(os: drgn.Object):
def pretty_print(self, dbufs):
print("{:>20} {:>8} {:>4} {:>8} {:>5} {}".format(
"addr", "object", "lvl", "blkid", "holds", "os"))
for dbuf in dbufs:
for dbuf in filter(self.argfilter, dbufs):
print("{:>20} {:>8d} {:>4d} {:>8d} {:>5d} {}".format(
hex(dbuf), int(dbuf.db.db_object), int(dbuf.db_level),
int(dbuf.db_blkid), int(dbuf.db_holds.rc_count),
Expand Down Expand Up @@ -115,6 +115,10 @@ def all_dnode_dbufs(self, dn: drgn.Object) -> Iterable[drgn.Object]:
def from_dnode(self, dn: drgn.Object) -> Iterable[drgn.Object]:
yield from filter(self.argfilter, self.all_dnode_dbufs(dn))

@sdb.InputHandler(input_type)
def from_dbuf(self, dbuf: drgn.Object) -> Iterable[drgn.Object]:
yield from filter(self.argfilter, [dbuf])

@staticmethod
def all_dbufs() -> Iterable[drgn.Object]:
hash_map = sdb.get_object("dbuf_hash_table").address_of_()
Expand Down
Loading