Commit b9f2fb84 authored by Vladislav Vaintroub's avatar Vladislav Vaintroub

Fix LP#909414: Valgrind warnings in threadpool code

parent 54b61b8b
...@@ -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 */
{ {
......
...@@ -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);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment