lib: Add a lighter weight internal checksum wrapper #1256
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The faster (OpenSSL/GnuTLS) code lived in a `GInputStream` wrapper, and that adds a lot of weight (GObject + vtable calls). Move it into a simple autoptr-struct wrapper, and use it in the metadata path, so we're now using the faster checksums there too. This also drops a malloc there as the new API does hexdigest in place to a buffer. Prep for more work in the commit path to avoid `GInputStream` for local file commits, and ["adopting" files](ostreedev#1255).
cgwalters
force-pushed
the
abstract-singleton-proxy-factory-checksum-bean
branch
from
dfc9079 to
69c898f
Compare
Closed
jlebon
reviewed
Oct 10, 2017
src/libotutil/ot-checksum-utils.c
Outdated
| guint8 digest[_OSTREE_SHA256_DIGEST_LEN]; | ||
| ot_checksum_get_digest (&checksum, digest, sizeof(digest)); | ||
| g_autofree guchar *ret_csum = g_malloc (sizeof (digest)); | ||
| memcpy (ret_csum, digest, sizeof (digest)); |
There was a problem hiding this comment.
Minor nit: we're not very consistent with space between the sizeof operator and the opening parenthesis.
| }; | ||
| typedef struct OtChecksum OtChecksum; | ||
|
|
||
| /* Same as OSTREE_SHA256_DIGEST_LEN, but this header can't depend on that */ |
There was a problem hiding this comment.
I think I missed the part about why we can't do that. Can you expand on this comment?
There was a problem hiding this comment.
We could, but it feels like a layering violation since conceptually src/libostree depends on src/libotutil (which depends on libglnx/), etc.
There was a problem hiding this comment.
I came up with something that'll at least error out if we somehow make them different ⬇️
|
Time for a ⚡️! @rh-atomic-bot r+ 36c8169 |
|
⚡ Test exempted: merge already tested. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The faster (OpenSSL/GnuTLS) code lived in a
GInputStreamwrapper, and thatadds a lot of weight (GObject + vtable calls). Move it into a simple
autoptr-struct wrapper, and use it in the metadata path, so we're
now using the faster checksums there too.
This also drops a malloc there as the new API does hexdigest in place to a
buffer.
Prep for more work in the commit path to avoid
GInputStreamfor local filecommits, and "adopting" files.