Differential D20222

Drop z_stream zbuf.state->dummy from SDT probe.
ClosedPublic
Actions

Authored by ota_j.email.ne.jp on May 10 2019, 12:15 AM.

Details

Reviewers

jmg
kib
delphij
markj
bz

Commits

rS348222: cryptodeflate: Drop z_stream zbuf.state->dummy from SDT probe.

Summary

First field of deflate.c's private internal_state structure points to an union field and not much useful to monitor.
This zlib internal_state structure with dummy field is only defined in FreeBSD version and for upgrading to zlib version in kernel.

Given one field is removed, use the macro takes 6 arguments.

Test Plan

dtrace -l

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 24228
Build 23068: arc lint + arc unit

Event Timeline

ota_j.email.ne.jp created this revision.May 10 2019, 12:15 AM

Herald added a reviewer: jmg. · View Herald TranscriptMay 10 2019, 12:15 AM

Herald added subscribers: Contributor Reviews (src), imp. · View Herald Transcript

Harbormaster completed remote builds in B24182: Diff 57244.May 10 2019, 12:16 AM

Harbormaster completed remote builds in B24182: Diff 57244.

ota_j.email.ne.jp edited the summary of this revision. (Show Details)May 10 2019, 10:05 AM

ota_j.email.ne.jp added reviewers: kib, delphij.

It looks I can put 2 versions of zlib into kernel.
Let's wait and see.

I think this can go independently with other changes: is there some reason that you would like to wait instead of proceeding?

Delete comments about usage of STD_PROBE5.

Harbormaster completed remote builds in B24228: Diff 57382.May 14 2019, 2:35 AM

Exclude unintended files... :(

Harbormaster completed remote builds in B24229: Diff 57383.May 14 2019, 2:35 AM

I was able to link both old and new versions of zlib at same time over weekend.
So, this change became no longer immediate blocker.
I thought it would be nicer to address zlib conversion in a single commit instead of two commits once upon time.

On the other hand, I think this change itself is a good improvement and fix for using the same probe for multiple cases.
If the maintainer is happy with this change alone, I'm also happy to go this in.
Based on MAINTAINERS file, jmg is the owner.

Is this something we need to mention in UPDATING file?