Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
godot
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
community
godot
Commits
c6de3872
Unverified
Commit
c6de3872
authored
May 31, 2020
by
Emmanuel Leblond
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove OS.get_system_time_secs/get_system_time_msecs and change OS.get_unix_time…
Remove OS.get_system_time_secs/get_system_time_msecs and change OS.get_unix_time return type to double
parent
a8787d1a
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
19 additions
and
89 deletions
+19
-89
core_bind.cpp
core/bind/core_bind.cpp
+1
-11
core_bind.h
core/bind/core_bind.h
+1
-3
os.cpp
core/os/os.cpp
+1
-9
os.h
core/os/os.h
+1
-3
OS.xml
doc/classes/OS.xml
+1
-1
os_unix.cpp
drivers/unix/os_unix.cpp
+3
-13
os_unix.h
drivers/unix/os_unix.h
+1
-3
os_windows.cpp
platform/windows/os_windows.cpp
+9
-43
os_windows.h
platform/windows/os_windows.h
+1
-3
No files found.
core/bind/core_bind.cpp
View file @
c6de3872
...
...
@@ -498,18 +498,10 @@ Dictionary _OS::get_time_zone_info() const {
return
infod
;
}
uint64_t
_OS
::
get_unix_time
()
const
{
double
_OS
::
get_unix_time
()
const
{
return
OS
::
get_singleton
()
->
get_unix_time
();
}
uint64_t
_OS
::
get_system_time_secs
()
const
{
return
OS
::
get_singleton
()
->
get_system_time_secs
();
}
uint64_t
_OS
::
get_system_time_msecs
()
const
{
return
OS
::
get_singleton
()
->
get_system_time_msecs
();
}
void
_OS
::
delay_usec
(
uint32_t
p_usec
)
const
{
OS
::
get_singleton
()
->
delay_usec
(
p_usec
);
}
...
...
@@ -729,8 +721,6 @@ void _OS::_bind_methods() {
ClassDB
::
bind_method
(
D_METHOD
(
"get_unix_time"
),
&
_OS
::
get_unix_time
);
ClassDB
::
bind_method
(
D_METHOD
(
"get_datetime_from_unix_time"
,
"unix_time_val"
),
&
_OS
::
get_datetime_from_unix_time
);
ClassDB
::
bind_method
(
D_METHOD
(
"get_unix_time_from_datetime"
,
"datetime"
),
&
_OS
::
get_unix_time_from_datetime
);
ClassDB
::
bind_method
(
D_METHOD
(
"get_system_time_secs"
),
&
_OS
::
get_system_time_secs
);
ClassDB
::
bind_method
(
D_METHOD
(
"get_system_time_msecs"
),
&
_OS
::
get_system_time_msecs
);
ClassDB
::
bind_method
(
D_METHOD
(
"get_exit_code"
),
&
_OS
::
get_exit_code
);
ClassDB
::
bind_method
(
D_METHOD
(
"set_exit_code"
,
"code"
),
&
_OS
::
set_exit_code
);
...
...
core/bind/core_bind.h
View file @
c6de3872
...
...
@@ -199,9 +199,7 @@ public:
Dictionary
get_datetime_from_unix_time
(
int64_t
unix_time_val
)
const
;
int64_t
get_unix_time_from_datetime
(
Dictionary
datetime
)
const
;
Dictionary
get_time_zone_info
()
const
;
uint64_t
get_unix_time
()
const
;
uint64_t
get_system_time_secs
()
const
;
uint64_t
get_system_time_msecs
()
const
;
double
get_unix_time
()
const
;
uint64_t
get_static_memory_usage
()
const
;
uint64_t
get_static_memory_peak_usage
()
const
;
...
...
core/os/os.cpp
View file @
c6de3872
...
...
@@ -83,15 +83,7 @@ uint64_t OS::get_splash_tick_msec() const {
return
_msec_splash
;
}
uint64_t
OS
::
get_unix_time
()
const
{
return
0
;
}
uint64_t
OS
::
get_system_time_secs
()
const
{
return
0
;
}
uint64_t
OS
::
get_system_time_msecs
()
const
{
double
OS
::
get_unix_time
()
const
{
return
0
;
}
...
...
core/os/os.h
View file @
c6de3872
...
...
@@ -209,9 +209,7 @@ public:
virtual
Time
get_time
(
bool
local
=
false
)
const
=
0
;
virtual
TimeZoneInfo
get_time_zone_info
()
const
=
0
;
virtual
String
get_iso_date_time
(
bool
local
=
false
)
const
;
virtual
uint64_t
get_unix_time
()
const
;
virtual
uint64_t
get_system_time_secs
()
const
;
virtual
uint64_t
get_system_time_msecs
()
const
;
virtual
double
get_unix_time
()
const
;
virtual
void
delay_usec
(
uint32_t
p_usec
)
const
=
0
;
virtual
uint64_t
get_ticks_usec
()
const
=
0
;
...
...
doc/classes/OS.xml
View file @
c6de3872
...
...
@@ -325,7 +325,7 @@
</description>
</method>
<method
name=
"get_unix_time"
qualifiers=
"const"
>
<return
type=
"
in
t"
>
<return
type=
"
floa
t"
>
</return>
<description>
Returns the current UNIX epoch timestamp.
...
...
drivers/unix/os_unix.cpp
View file @
c6de3872
...
...
@@ -163,21 +163,11 @@ String OS_Unix::get_name() const {
return
"Unix"
;
}
uint64_t
OS_Unix
::
get_unix_time
()
const
{
return
time
(
nullptr
);
};
uint64_t
OS_Unix
::
get_system_time_secs
()
const
{
struct
timeval
tv_now
;
gettimeofday
(
&
tv_now
,
nullptr
);
return
uint64_t
(
tv_now
.
tv_sec
);
}
uint64_t
OS_Unix
::
get_system_time_msecs
()
const
{
double
OS_Unix
::
get_unix_time
()
const
{
struct
timeval
tv_now
;
gettimeofday
(
&
tv_now
,
nullptr
);
return
uint64_t
(
tv_now
.
tv_sec
)
*
1000
+
uint64_t
(
tv_now
.
tv_usec
)
/
1
000
;
}
return
(
double
)
tv_now
.
tv_sec
+
double
(
tv_now
.
tv_usec
)
/
1000
000
;
}
;
OS
::
Date
OS_Unix
::
get_date
(
bool
utc
)
const
{
time_t
t
=
time
(
nullptr
);
...
...
drivers/unix/os_unix.h
View file @
c6de3872
...
...
@@ -77,9 +77,7 @@ public:
virtual
Time
get_time
(
bool
utc
)
const
;
virtual
TimeZoneInfo
get_time_zone_info
()
const
;
virtual
uint64_t
get_unix_time
()
const
;
virtual
uint64_t
get_system_time_secs
()
const
;
virtual
uint64_t
get_system_time_msecs
()
const
;
virtual
double
get_unix_time
()
const
;
virtual
void
delay_usec
(
uint32_t
p_usec
)
const
;
virtual
uint64_t
get_ticks_usec
()
const
;
...
...
platform/windows/os_windows.cpp
View file @
c6de3872
...
...
@@ -343,55 +343,21 @@ OS::TimeZoneInfo OS_Windows::get_time_zone_info() const {
return
ret
;
}
uint64_t
OS_Windows
::
get_unix_time
()
const
{
FILETIME
ft
;
SYSTEMTIME
st
;
GetSystemTime
(
&
st
);
SystemTimeToFileTime
(
&
st
,
&
ft
);
SYSTEMTIME
ep
;
ep
.
wYear
=
1970
;
ep
.
wMonth
=
1
;
ep
.
wDayOfWeek
=
4
;
ep
.
wDay
=
1
;
ep
.
wHour
=
0
;
ep
.
wMinute
=
0
;
ep
.
wSecond
=
0
;
ep
.
wMilliseconds
=
0
;
FILETIME
fep
;
SystemTimeToFileTime
(
&
ep
,
&
fep
);
// Type punning through unions (rather than pointer cast) as per:
// https://docs.microsoft.com/en-us/windows/desktop/api/minwinbase/ns-minwinbase-filetime#remarks
ULARGE_INTEGER
ft_punning
;
ft_punning
.
LowPart
=
ft
.
dwLowDateTime
;
ft_punning
.
HighPart
=
ft
.
dwHighDateTime
;
ULARGE_INTEGER
fep_punning
;
fep_punning
.
LowPart
=
fep
.
dwLowDateTime
;
fep_punning
.
HighPart
=
fep
.
dwHighDateTime
;
return
(
ft_punning
.
QuadPart
-
fep_punning
.
QuadPart
)
/
10000000
;
};
uint64_t
OS_Windows
::
get_system_time_secs
()
const
{
return
get_system_time_msecs
()
/
1000
;
}
uint64_t
OS_Windows
::
get_system_time_msecs
()
const
{
const
uint64_t
WINDOWS_TICK
=
10000
;
const
uint64_t
MSEC_TO_UNIX_EPOCH
=
11644473600000LL
;
double
OS_Windows
::
get_unix_time
()
const
{
// 1 Windows tick is 100ns
const
uint64_t
WINDOWS_TICKS_PER_SECOND
=
10000000
;
const
uint64_t
TICKS_TO_UNIX_EPOCH
=
116444736000000000LL
;
SYSTEMTIME
st
;
GetSystemTime
(
&
st
);
FILETIME
ft
;
SystemTimeToFileTime
(
&
st
,
&
ft
);
uint64_t
ret
;
ret
=
ft
.
dwHighDateTime
;
ret
<<=
32
;
ret
|=
ft
.
dwLowDateTime
;
uint64_t
ticks_time
;
ticks_time
=
ft
.
dwHighDateTime
;
ticks_time
<<=
32
;
ticks_time
|=
ft
.
dwLowDateTime
;
return
(
uint64_t
)(
ret
/
WINDOWS_TICK
-
MSEC_TO_UNIX_EPOCH
)
;
return
(
double
)(
ticks_time
-
TICKS_TO_UNIX_EPOCH
)
/
WINDOWS_TICKS_PER_SECOND
;
}
void
OS_Windows
::
delay_usec
(
uint32_t
p_usec
)
const
{
...
...
platform/windows/os_windows.h
View file @
c6de3872
...
...
@@ -129,9 +129,7 @@ public:
virtual
Date
get_date
(
bool
utc
)
const
;
virtual
Time
get_time
(
bool
utc
)
const
;
virtual
TimeZoneInfo
get_time_zone_info
()
const
;
virtual
uint64_t
get_unix_time
()
const
;
virtual
uint64_t
get_system_time_secs
()
const
;
virtual
uint64_t
get_system_time_msecs
()
const
;
virtual
double
get_unix_time
()
const
;
virtual
Error
set_cwd
(
const
String
&
p_cwd
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment