mike/biboumi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use strerror and log_error instead of perrror

Browse Source
This commit is contained in:
Florent Le Coz
2014-02-08 07:59:02 +01:00
parent c8b41d5e35
commit da85617428
2 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/poller.cpp
+7 -7
View File
@@ -16,7 +16,7 @@ Poller::Poller()
this->epfd = ::epoll_create1(0); this->epfd = ::epoll_create1(0);
if (this->epfd == -1) if (this->epfd == -1)
{ {
perror("epoll"); log_error("epoll failed: " << strerror(errno));
throw std::runtime_error("Could not create epoll instance"); throw std::runtime_error("Could not create epoll instance");
} }
#endif #endif
@@ -47,7 +47,7 @@ void Poller::add_socket_handler(std::shared_ptr<SocketHandler> socket_handler)
const int res = ::epoll_ctl(this->epfd, EPOLL_CTL_ADD, socket_handler->get_socket(), &event); const int res = ::epoll_ctl(this->epfd, EPOLL_CTL_ADD, socket_handler->get_socket(), &event);
if (res == -1) if (res == -1)
{ {
perror("epoll_ctl"); log_error("epoll_ctl failed: " << strerror(errno));
throw std::runtime_error("Could not add socket to epoll"); throw std::runtime_error("Could not add socket to epoll");
} }
#endif #endif
@@ -79,7 +79,7 @@ void Poller::remove_socket_handler(const socket_t socket)
const int res = ::epoll_ctl(this->epfd, EPOLL_CTL_DEL, socket, nullptr); const int res = ::epoll_ctl(this->epfd, EPOLL_CTL_DEL, socket, nullptr);
if (res == -1) if (res == -1)
{ {
perror("epoll_ctl"); log_error("epoll_ctl failed: " << strerror(errno));
throw std::runtime_error("Could not remove socket from epoll"); throw std::runtime_error("Could not remove socket from epoll");
} }
#endif #endif
@@ -102,7 +102,7 @@ void Poller::watch_send_events(SocketHandler* socket_handler)
const int res = ::epoll_ctl(this->epfd, EPOLL_CTL_MOD, socket_handler->get_socket(), &event); const int res = ::epoll_ctl(this->epfd, EPOLL_CTL_MOD, socket_handler->get_socket(), &event);
if (res == -1) if (res == -1)
{ {
perror("epoll_ctl"); log_error("epoll_ctl failed: " << strerror(errno));
throw std::runtime_error("Could not modify socket flags in epoll"); throw std::runtime_error("Could not modify socket flags in epoll");
} }
#endif #endif
@@ -125,7 +125,7 @@ void Poller::stop_watching_send_events(SocketHandler* socket_handler)
const int res = ::epoll_ctl(this->epfd, EPOLL_CTL_MOD, socket_handler->get_socket(), &event); const int res = ::epoll_ctl(this->epfd, EPOLL_CTL_MOD, socket_handler->get_socket(), &event);
if (res == -1) if (res == -1)
{ {
perror("epoll_ctl"); log_error("epoll_ctl failed: " << strerror(errno));
throw std::runtime_error("Could not modify socket flags in epoll"); throw std::runtime_error("Could not modify socket flags in epoll");
} }
#endif #endif
@@ -141,7 +141,7 @@ int Poller::poll(const std::chrono::milliseconds& timeout)
{ {
if (errno == EINTR) if (errno == EINTR)
return true; return true;
perror("poll"); log_error("poll failed: " << strerror(errno));
throw std::runtime_error("Poll failed"); throw std::runtime_error("Poll failed");
} }
// We cannot possibly have more ready events than the number of fds we are // We cannot possibly have more ready events than the number of fds we are
@@ -173,7 +173,7 @@ int Poller::poll(const std::chrono::milliseconds& timeout)
{ {
if (errno == EINTR) if (errno == EINTR)
return 0; return 0;
perror("epoll_wait"); log_error("epoll wait: " << strerror(errno));
throw std::runtime_error("Epoll_wait failed"); throw std::runtime_error("Epoll_wait failed");
} }
for (int i = 0; i < nb_events; ++i) for (int i = 0; i < nb_events; ++i)
src/network/socket_handler.cpp
+2 -3
View File
@@ -56,8 +56,7 @@ std::pair<bool, std::string> SocketHandler::connect(const std::string& address,
this->on_connected(); this->on_connected();
return std::make_pair(true, ""); return std::make_pair(true, "");
} }
log_info("Connection failed:"); log_info("Connection failed:" << strerror(errno));
perror("connect");
} }
log_error("All connection attempts failed."); log_error("All connection attempts failed.");
this->close(); this->close();
@@ -97,7 +96,7 @@ void SocketHandler::on_send()
const ssize_t res = ::send(this->socket, this->out_buf.data(), this->out_buf.size(), 0); const ssize_t res = ::send(this->socket, this->out_buf.data(), this->out_buf.size(), 0);
if (res == -1) if (res == -1)
{ {
perror("send"); log_error("send failed: " << strerror(errno));
this->close(); this->close();
} }
else else