Replace all perror() calls with our own log calls.

[cubemap] / server.cpp

diff --git a/server.cpp b/server.cpp
index 789d8eabd14c88c67524b632b7dbe1debbe410fd..46bda5b21935ff36d0aca3be838885c5e4b7b7ba 100644 (file)
--- a/server.cpp
+++ b/server.cpp
@@ -14,6 +14,7 @@
 #include <utility>
 #include <vector>
 
+#include "log.h"
 #include "markpool.h"
 #include "mutexlock.h"
 #include "parse.h"
@@ -30,7 +31,7 @@ Server::Server()
 
        epoll_fd = epoll_create(1024);  // Size argument is ignored.
        if (epoll_fd == -1) {
-               perror("epoll_fd");
+               log_perror("epoll_fd");
                exit(1);
        }
 }
@@ -43,7 +44,7 @@ Server::~Server()
        } while (ret == -1 && errno == EINTR);
 
        if (ret == -1) {
-               perror("close(epoll_fd)");
+               log_perror("close(epoll_fd)");
        }
 }
 
@@ -71,7 +72,7 @@ void Server::do_work()
                        continue;
                }
                if (nfds == -1) {
-                       perror("epoll_wait");
+                       log_perror("epoll_wait");
                        exit(1);
                }
 
@@ -140,7 +141,7 @@ void Server::add_client(int sock)
        ev.events = EPOLLIN | EPOLLET | EPOLLRDHUP;
        ev.data.u64 = reinterpret_cast<uint64_t>(&clients[sock]);
        if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, sock, &ev) == -1) {
-               perror("epoll_ctl(EPOLL_CTL_ADD)");
+               log_perror("epoll_ctl(EPOLL_CTL_ADD)");
                exit(1);
        }
 
@@ -172,7 +173,7 @@ void Server::add_client_from_serialized(const ClientProto &client)
        ev.data.u64 = 0;  // Keep Valgrind happy.
        ev.data.u64 = reinterpret_cast<uint64_t>(client_ptr);
        if (epoll_ctl(epoll_fd, EPOLL_CTL_ADD, client.sock(), &ev) == -1) {
-               perror("epoll_ctl(EPOLL_CTL_ADD)");
+               log_perror("epoll_ctl(EPOLL_CTL_ADD)");
                exit(1);
        }
 
@@ -253,7 +254,7 @@ read_request_again:
                        return;
                }
                if (ret == -1) {
-                       perror("read");
+                       log_perror("read");
                        close_client(client);
                        return;
                }
@@ -267,7 +268,7 @@ read_request_again:
        
                switch (status) {
                case RP_OUT_OF_SPACE:
-                       fprintf(stderr, "WARNING: fd %d sent overlong request!\n", client->sock);
+                       log(WARNING, "fd %d sent overlong request!", client->sock);
                        close_client(client);
                        return;
                case RP_NOT_FINISHED_YET:
@@ -275,7 +276,7 @@ read_request_again:
                        // See if there's more data for us.
                        goto read_request_again;
                case RP_EXTRA_DATA:
-                       fprintf(stderr, "WARNING: fd %d had junk data after request!\n", client->sock);
+                       log(WARNING, "fd %d had junk data after request!", client->sock);
                        close_client(client);
                        return;
                case RP_FINISHED:
@@ -315,7 +316,7 @@ sending_header_or_error_again:
 
                if (ret == -1) {
                        // Error! Postcondition #1.
-                       perror("write");
+                       log_perror("write");
                        close_client(client);
                        return;
                }
@@ -356,7 +357,7 @@ sending_data_again:
                        return;
                }
                if (bytes_to_send > stream->backlog_size) {
-                       fprintf(stderr, "WARNING: fd %d lost %lld bytes, maybe too slow connection\n",
+                       log(WARNING, "fd %d lost %lld bytes, maybe too slow connection",
                                client->sock,
                                (long long int)(bytes_to_send - stream->backlog_size));
                        client->stream_pos = stream->bytes_received - stream->backlog_size;
@@ -386,7 +387,7 @@ sending_data_again:
                }
                if (ret == -1) {
                        // Error, close; postcondition #1.
-                       perror("sendfile");
+                       log_perror("sendfile");
                        close_client(client);
                        return;
                }
@@ -397,7 +398,7 @@ sending_data_again:
                        // We don't have any more data for this client, so put it to sleep.
                        // This is postcondition #3.
                        stream->put_client_to_sleep(client);
-               } else if (more_data && ret == bytes_to_send) {
+               } else if (more_data && size_t(ret) == bytes_to_send) {
                        goto sending_data_again;
                }
                break;
@@ -434,7 +435,7 @@ int Server::parse_request(Client *client)
        }
        if (setsockopt(client->sock, SOL_SOCKET, SO_MARK, &client->fwmark, sizeof(client->fwmark)) == -1) {                          
                if (client->fwmark != 0) {
-                       perror("setsockopt(SO_MARK)");
+                       log_perror("setsockopt(SO_MARK)");
                }
        }
        client->request.clear();
@@ -454,7 +455,7 @@ void Server::construct_header(Client *client)
        ev.data.u64 = reinterpret_cast<uint64_t>(client);
 
        if (epoll_ctl(epoll_fd, EPOLL_CTL_MOD, client->sock, &ev) == -1) {
-               perror("epoll_ctl(EPOLL_CTL_MOD)");
+               log_perror("epoll_ctl(EPOLL_CTL_MOD)");
                exit(1);
        }
 }
@@ -474,7 +475,7 @@ void Server::construct_error(Client *client, int error_code)
        ev.data.u64 = reinterpret_cast<uint64_t>(client);
 
        if (epoll_ctl(epoll_fd, EPOLL_CTL_MOD, client->sock, &ev) == -1) {
-               perror("epoll_ctl(EPOLL_CTL_MOD)");
+               log_perror("epoll_ctl(EPOLL_CTL_MOD)");
                exit(1);
        }
 }
@@ -489,7 +490,7 @@ void delete_from(vector<T> *v, T elem)
 void Server::close_client(Client *client)
 {
        if (epoll_ctl(epoll_fd, EPOLL_CTL_DEL, client->sock, NULL) == -1) {
-               perror("epoll_ctl(EPOLL_CTL_DEL)");
+               log_perror("epoll_ctl(EPOLL_CTL_DEL)");
                exit(1);
        }
 
@@ -510,7 +511,7 @@ void Server::close_client(Client *client)
        } while (ret == -1 && errno == EINTR);
 
        if (ret == -1) {
-               perror("close");
+               log_perror("close");
        }
 
        clients.erase(client->sock);