more cleanups

Author: pcmoritz

cpp/src/plasma/io.cc

@@ -28,9 +28,10 @@
 
 using arrow::Status;
 
-/* Number of times we try connecting to a socket. */
-#define NUM_CONNECT_ATTEMPTS 50
-#define CONNECT_TIMEOUT_MS 100
+/// Number of times we try connecting to a socket.
+constexpr int64_t kNumConnectAttempts = 50;
+/// Time to wait between connection attempts.
+constexpr int64_t kConnectTimeoutMs = 100;
 
 namespace plasma {
 
@@ -39,8 +40,8 @@ Status WriteBytes(int fd, uint8_t* cursor, size_t length) {
   size_t bytesleft = length;
   size_t offset = 0;
   while (bytesleft > 0) {
-    /* While we haven't written the whole message, write to the file descriptor,
-     * advance the cursor, and decrease the amount left to write. */
+    // While we haven't written the whole message, write to the file descriptor,
+    // advance the cursor, and decrease the amount left to write.
     nbytes = write(fd, cursor + offset, bytesleft);
     if (nbytes < 0) {
       if (errno == EAGAIN || errno == EWOULDBLOCK || errno == EINTR) {
@@ -68,7 +69,7 @@ Status WriteMessage(int fd, int64_t type, int64_t length, uint8_t* bytes) {
 
 Status ReadBytes(int fd, uint8_t* cursor, size_t length) {
   ssize_t nbytes = 0;
-  /* Termination condition: EOF or read 'length' bytes total. */
+  // Termination condition: EOF or read 'length' bytes total.
   size_t bytesleft = length;
   size_t offset = 0;
   while (bytesleft > 0) {
@@ -117,7 +118,7 @@ int bind_ipc_sock(const std::string& pathname, bool shall_listen) {
     ARROW_LOG(ERROR) << "socket() failed for pathname " << pathname;
     return -1;
   }
-  /* Tell the system to allow the port to be reused. */
+  // Tell the system to allow the port to be reused.
   int on = 1;
   if (setsockopt(socket_fd, SOL_SOCKET, SO_REUSEADDR, reinterpret_cast<char*>(&on),
                  sizeof(on)) < 0) {
@@ -152,23 +153,23 @@ int bind_ipc_sock(const std::string& pathname, bool shall_listen) {
 
 Status ConnectIpcSocketRetry(const std::string& pathname, int num_retries,
                              int64_t timeout, int* fd) {
-  /* Pick the default values if the user did not specify. */
+  // Pick the default values if the user did not specify.
   if (num_retries < 0) {
-    num_retries = NUM_CONNECT_ATTEMPTS;
+    num_retries = kNumConnectAttempts;
   }
   if (timeout < 0) {
-    timeout = CONNECT_TIMEOUT_MS;
+    timeout = kConnectTimeoutMs;
   }
   *fd = connect_ipc_sock(pathname);
   while (*fd < 0 && num_retries > 0) {
     ARROW_LOG(ERROR) << "Connection to IPC socket failed for pathname " << pathname
                      << ", retrying " << num_retries << " more times";
-    /* Sleep for timeout milliseconds. */
+    // Sleep for timeout milliseconds.
     usleep(static_cast<int>(timeout * 1000));
     *fd = connect_ipc_sock(pathname);
     --num_retries;
   }
-  /* If we could not connect to the socket, exit. */
+  // If we could not connect to the socket, exit.
   if (*fd == -1) {
     std::stringstream ss;
     ss << "Could not connect to socket " << pathname;
@@ -217,15 +218,15 @@ std::unique_ptr<uint8_t[]> read_message_async(int sock) {
   int64_t size;
   Status s = ReadBytes(sock, reinterpret_cast<uint8_t*>(&size), sizeof(int64_t));
   if (!s.ok()) {
-    /* The other side has closed the socket. */
+    // The other side has closed the socket.
     ARROW_LOG(DEBUG) << "Socket has been closed, or some other error has occurred.";
     close(sock);
     return NULL;
   }
   auto message = std::unique_ptr<uint8_t[]>(new uint8_t[size]);
   s = ReadBytes(sock, message.get(), size);
   if (!s.ok()) {
-    /* The other side has closed the socket. */
+    // The other side has closed the socket.
     ARROW_LOG(DEBUG) << "Socket has been closed, or some other error has occurred.";
     close(sock);
     return NULL;