cmd/snap-confine: workaround time_t size differences between architectures #15113
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
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## master #15113 +/- ##
==========================================
- Coverage 78.07% 78.07% -0.01%
==========================================
Files 1182 1188 +6
Lines 157743 158027 +284
==========================================
+ Hits 123154 123375 +221
- Misses 26943 26987 +44
- Partials 7646 7665 +19
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
zyga
approved these changes
Feb 21, 2025
valentindavid
approved these changes
Feb 21, 2025
cmd/snap-confine/snap-confine.c
Outdated
| @@ -277,7 +278,14 @@ static void log_startup_stage(const char *stage) { | |||
| } | |||
| struct timeval tv; | |||
| gettimeofday(&tv, NULL); | |||
| debug("-- snap startup {\"stage\":\"%s\", \"time\":\"%lu.%06lu\"}", stage, tv.tv_sec, tv.tv_usec); | |||
| /* TODO ifdef on __TIMESIZE ? */ | |||
There was a problem hiding this comment.
It would go to the else if __TIMESIZE is not defined, right? So 32 bits. Is it really the default we want?
There was a problem hiding this comment.
tweaked to #if __TIMESIZE == 32
bboozzoo
force-pushed
the
bboozzoo/time_t-size
branch
from
84cf191 to
d48f15c
Compare
|
Mon Feb 24 14:24:08 UTC 2025 Failures:Executing:
Restoring:
|
bboozzoo
force-pushed
the
bboozzoo/time_t-size
branch
from
d48f15c to
6a678fb
Compare
ernestl
reviewed
Feb 21, 2025
cmd/snap-confine/snap-confine.c
Outdated
| @@ -277,7 +278,13 @@ static void log_startup_stage(const char *stage) { | |||
| } | |||
| struct timeval tv; | |||
| gettimeofday(&tv, NULL); | |||
| debug("-- snap startup {\"stage\":\"%s\", \"time\":\"%lu.%06lu\"}", stage, tv.tv_sec, tv.tv_usec); | |||
| #if __TIMESIZE == 32 | |||
There was a problem hiding this comment.
Is this not sufficient and simple? #15111
There was a problem hiding this comment.
rebased and updated with explicit int64_t and formatting macros
…tures
The following error was observed when building for armhf:
snap-confine/snap-confine.c: In function ‘log_startup_stage’:
snap-confine/snap-confine.c:280:60: error: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘__time64_t’ {aka ‘long long int’} [-Werror=format=]
280 | debug("-- snap startup {\"stage\":\"%s\", \"time\":\"%lu.%06lu\"}", stage, tv.tv_sec, tv.tv_usec);
| ~~^ ~~~~~~~~~
| | |
| long unsigned int __time64_t {aka long long int}
| %llu
snap-confine/snap-confine.c:280:66: error: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 4 has type ‘__suseconds64_t’ {aka ‘long long int’} [-Werror=format=]
280 | debug("-- snap startup {\"stage\":\"%s\", \"time\":\"%lu.%06lu\"}", stage, tv.tv_sec, tv.tv_usec);
| ~~~~^ ~~~~~~~~~~
| | |
| long unsigned int __suseconds64_t {aka long long int}
| %06llu
cc1: all warnings being treated as errors
Use proper formatting macros and check for time_t size.
Signed-off-by: Maciej Borzecki <[email protected]>
bboozzoo
force-pushed
the
bboozzoo/time_t-size
branch
from
6a678fb to
df56019
Compare
bboozzoo
requested review from
zyga,
alfonsosanchezbeato,
ernestl and
valentindavid
zyga
approved these changes
Feb 24, 2025
alfonsosanchezbeato
approved these changes
Feb 24, 2025
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 following error was observed when building for armhf:
Use proper formatting macros and check for time_t size.
Thanks for helping us make a better snapd!
Have you signed the license agreement and read the contribution guide?