Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
micropython
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
card10
micropython
Commits
de829220
Commit
de829220
authored
11 years ago
by
Paul Sokolovsky
Browse files
Options
Downloads
Patches
Plain Diff
unix modtime: Adhere to MICROPY_ENABLE_FLOAT better.
parent
b7e90ea0
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
unix/modtime.c
+12
-2
12 additions, 2 deletions
unix/modtime.c
with
12 additions
and
2 deletions
unix/modtime.c
+
12
−
2
View file @
de829220
...
@@ -11,18 +11,28 @@
...
@@ -11,18 +11,28 @@
#include
"runtime.h"
#include
"runtime.h"
STATIC
mp_obj_t
mod_time_time
()
{
STATIC
mp_obj_t
mod_time_time
()
{
#if MICROPY_ENABLE_FLOAT
struct
timeval
tv
;
gettimeofday
(
&
tv
,
NULL
);
mp_float_t
val
=
tv
.
tv_sec
+
(
mp_float_t
)
tv
.
tv_usec
/
1000000
;
return
mp_obj_new_float
(
val
);
#else
return
mp_obj_new_int
((
machine_int_t
)
time
(
NULL
));
return
mp_obj_new_int
((
machine_int_t
)
time
(
NULL
));
#endif
}
}
STATIC
MP_DEFINE_CONST_FUN_OBJ_0
(
mod_time_time_obj
,
mod_time_time
);
STATIC
MP_DEFINE_CONST_FUN_OBJ_0
(
mod_time_time_obj
,
mod_time_time
);
// Note: this is deprecated since CPy3.3, but pystone still uses it.
// Note: this is deprecated since CPy3.3, but pystone still uses it.
STATIC
mp_obj_t
mod_time_clock
()
{
STATIC
mp_obj_t
mod_time_clock
()
{
// return mp_obj_new_int((machine_int_t)clock());
#if MICROPY_ENABLE_FLOAT
// POSIX requires CLOCKS_PER_SEC equals 1000000, so that's what we assume
// POSIX requires CLOCKS_PER_SEC equals 1000000, so that's what we assume
.
// float cannot represent full range of int32 precisely, so we pre-divide
// float cannot represent full range of int32 precisely, so we pre-divide
// int to reduce resolution, and then actually do float division hoping
// int to reduce resolution, and then actually do float division hoping
// to preserve integer part resolution.
// to preserve integer part resolution.
return
mp_obj_new_float
((
float
)(
clock
()
/
1000
)
/
1000
.
0
);
return
mp_obj_new_float
((
float
)(
clock
()
/
1000
)
/
1000
.
0
);
#else
return
mp_obj_new_int
((
machine_int_t
)
clock
());
#endif
}
}
STATIC
MP_DEFINE_CONST_FUN_OBJ_0
(
mod_time_clock_obj
,
mod_time_clock
);
STATIC
MP_DEFINE_CONST_FUN_OBJ_0
(
mod_time_clock_obj
,
mod_time_clock
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment