Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
b9f2fb84
Commit
b9f2fb84
authored
Dec 29, 2011
by
Vladislav Vaintroub
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix LP#909414: Valgrind warnings in threadpool code
parent
54b61b8b
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
sql/net_serv.cc
sql/net_serv.cc
+2
-0
sql/threadpool_unix.cc
sql/threadpool_unix.cc
+2
-0
No files found.
sql/net_serv.cc
View file @
b9f2fb84
...
@@ -138,6 +138,8 @@ my_bool my_net_init(NET *net, Vio* vio)
...
@@ -138,6 +138,8 @@ my_bool my_net_init(NET *net, Vio* vio)
net
->
net_skip_rest_factor
=
0
;
net
->
net_skip_rest_factor
=
0
;
net
->
last_errno
=
0
;
net
->
last_errno
=
0
;
net
->
unused
=
0
;
net
->
unused
=
0
;
net
->
read_timeout
=
0
;
net
->
write_timeout
=
0
;
if
(
vio
!=
0
)
/* If real connection */
if
(
vio
!=
0
)
/* If real connection */
{
{
...
...
sql/threadpool_unix.cc
View file @
b9f2fb84
...
@@ -203,6 +203,7 @@ static int io_poll_create()
...
@@ -203,6 +203,7 @@ static int io_poll_create()
int
io_poll_associate_fd
(
int
pollfd
,
int
fd
,
void
*
data
)
int
io_poll_associate_fd
(
int
pollfd
,
int
fd
,
void
*
data
)
{
{
struct
epoll_event
ev
;
struct
epoll_event
ev
;
ev
.
data
.
u64
=
0
;
/* Keep valgrind happy */
ev
.
data
.
ptr
=
data
;
ev
.
data
.
ptr
=
data
;
ev
.
events
=
EPOLLIN
|
EPOLLET
|
EPOLLERR
|
EPOLLRDHUP
|
EPOLLONESHOT
;
ev
.
events
=
EPOLLIN
|
EPOLLET
|
EPOLLERR
|
EPOLLRDHUP
|
EPOLLONESHOT
;
return
epoll_ctl
(
pollfd
,
EPOLL_CTL_ADD
,
fd
,
&
ev
);
return
epoll_ctl
(
pollfd
,
EPOLL_CTL_ADD
,
fd
,
&
ev
);
...
@@ -213,6 +214,7 @@ int io_poll_associate_fd(int pollfd, int fd, void *data)
...
@@ -213,6 +214,7 @@ int io_poll_associate_fd(int pollfd, int fd, void *data)
int
io_poll_start_read
(
int
pollfd
,
int
fd
,
void
*
data
)
int
io_poll_start_read
(
int
pollfd
,
int
fd
,
void
*
data
)
{
{
struct
epoll_event
ev
;
struct
epoll_event
ev
;
ev
.
data
.
u64
=
0
;
/* Keep valgrind happy */
ev
.
data
.
ptr
=
data
;
ev
.
data
.
ptr
=
data
;
ev
.
events
=
EPOLLIN
|
EPOLLET
|
EPOLLERR
|
EPOLLRDHUP
|
EPOLLONESHOT
;
ev
.
events
=
EPOLLIN
|
EPOLLET
|
EPOLLERR
|
EPOLLRDHUP
|
EPOLLONESHOT
;
return
epoll_ctl
(
pollfd
,
EPOLL_CTL_MOD
,
fd
,
&
ev
);
return
epoll_ctl
(
pollfd
,
EPOLL_CTL_MOD
,
fd
,
&
ev
);
...
...
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