Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
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
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
f3f4b332
Commit
f3f4b332
authored
Aug 10, 2013
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
event/MultiSocketMonitor: use uint64_t instead of gint64
Unsigned and portable.
parent
84ac79bb
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
MultiSocketMonitor.cxx
src/event/MultiSocketMonitor.cxx
+3
-3
MultiSocketMonitor.hxx
src/event/MultiSocketMonitor.hxx
+3
-2
No files found.
src/event/MultiSocketMonitor.cxx
View file @
f3f4b332
...
...
@@ -43,7 +43,7 @@ MultiSocketMonitor::MultiSocketMonitor(EventLoop &_loop)
:
loop
(
_loop
),
source
((
Source
*
)
g_source_new
(
&
multi_socket_monitor_source_funcs
,
sizeof
(
*
source
))),
absolute_timeout_us
(
G_MAXINT64
)
{
absolute_timeout_us
(
-
1
)
{
source
->
monitor
=
this
;
g_source_attach
(
&
source
->
base
,
loop
.
GetContext
());
...
...
@@ -61,8 +61,8 @@ MultiSocketMonitor::Prepare(gint *timeout_r)
{
int
timeout_ms
=
*
timeout_r
=
PrepareSockets
();
absolute_timeout_us
=
timeout_ms
<
0
?
G_MAXINT64
:
GetTime
()
+
gint64
(
timeout_ms
)
*
1000
;
?
uint64_t
(
-
1
)
:
GetTime
()
+
uint64_t
(
timeout_ms
)
*
1000
;
return
false
;
}
...
...
src/event/MultiSocketMonitor.hxx
View file @
f3f4b332
...
...
@@ -29,6 +29,7 @@
#include <forward_list>
#include <assert.h>
#include <stdint.h>
#ifdef WIN32
/* ERRORis a WIN32 macro that poisons our namespace; this is a
...
...
@@ -52,7 +53,7 @@ class MultiSocketMonitor {
EventLoop
&
loop
;
Source
*
source
;
gint64
absolute_timeout_us
;
uint64_t
absolute_timeout_us
;
std
::
forward_list
<
GPollFD
>
fds
;
public
:
...
...
@@ -69,7 +70,7 @@ public:
}
gcc_pure
gint64
GetTime
()
const
{
uint64_t
GetTime
()
const
{
return
g_source_get_time
(
&
source
->
base
);
}
...
...
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