Fix some minor clang-tidy issues (#152)

- Closes #147. Authors: - Lawrence Mitchell (https://github.com/wence-) - Peter Andreas Entschev (https://github.com/pentschev) Approvers: - Peter Andreas Entschev (https://github.com/pentschev) URL: #152
rapidsai · Jan 9, 2024 · 2a19c57 · 2a19c57
1 parent 94c5dd7
commit 2a19c57
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 20 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met:

diff --git a/cpp/include/ucxx/constructors.h b/cpp/include/ucxx/constructors.h
@@ -1,13 +1,13 @@
 /**
- * SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES.
+ * SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES.
  * SPDX-License-Identifier: BSD-3-Clause
  */
 #pragma once
 
 #include <memory>
 #include <string>
-#include <vector>
 
+#include <ucxx/component.h>
 #include <ucxx/request_data.h>
 #include <ucxx/typedefs.h>
 

diff --git a/cpp/include/ucxx/request_am.h b/cpp/include/ucxx/request_am.h
@@ -1,5 +1,5 @@
 /**
- * SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES.
+ * SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES.
  * SPDX-License-Identifier: BSD-3-Clause
  */
 #pragma once
@@ -90,7 +90,7 @@ class RequestAm : public Request {
     RequestCallbackUserFunction callbackFunction,
     RequestCallbackUserData callbackData);
 
-  virtual void populateDelayedSubmission();
+  void populateDelayedSubmission() override;
 
   /**
    * @brief Create and submit an active message send request.

diff --git a/cpp/python/include/ucxx/python/constructors.h b/cpp/python/include/ucxx/python/constructors.h
@@ -1,11 +1,13 @@
 /**
- * SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.
+ * SPDX-FileCopyrightText: Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES.
  * SPDX-License-Identifier: BSD-3-Clause
  */
 #pragma once
 
 #include <memory>
 
+#include <Python.h>
+
 #include <ucxx/buffer.h>
 
 namespace ucxx {

diff --git a/cpp/python/src/python_future.cpp b/cpp/python/src/python_future.cpp
@@ -1,9 +1,10 @@
 /**
- * SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES.
+ * SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES.
  * SPDX-License-Identifier: BSD-3-Clause
  */
 #include <memory>
 #include <stdexcept>
+#include <utility>
 
 #include <Python.h>
 

diff --git a/cpp/src/request_am.cpp b/cpp/src/request_am.cpp
@@ -1,5 +1,5 @@
 /**
- * SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES.
+ * SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES.
  * SPDX-License-Identifier: BSD-3-Clause
  */
 #include <cstdio>
@@ -145,7 +145,7 @@ ucs_status_t RequestAm::recvCallback(void* arg,
       // recvAmMessage.callback(nullptr, UCS_ERR_UNSUPPORTED);
       // return UCS_ERR_UNSUPPORTED;
 
-      ucxx_trace_req("No allocator registered for memory type %lu, falling back to host memory.",
+      ucxx_trace_req("No allocator registered for memory type %u, falling back to host memory.",
                      allocatorType);
       allocatorType = UCS_MEMORY_TYPE_HOST;
     }
@@ -292,7 +292,7 @@ void RequestAm::populateDelayedSubmission()
       ucxx_trace_req_f(_ownerString.c_str(),
                        _request,
                        _operationName.c_str(),
-                       "buffer %p, size %lu, memoryType: %lu, future %p, future handle %p, "
+                       "buffer %p, size %lu, memoryType: %u, future %p, future handle %p, "
                        "populateDelayedSubmission",
                        buffer,
                        length,
@@ -303,7 +303,7 @@ void RequestAm::populateDelayedSubmission()
       ucxx_trace_req_f(_ownerString.c_str(),
                        _request,
                        _operationName.c_str(),
-                       "buffer %p, size %lu, memoryType: %lu, populateDelayedSubmission",
+                       "buffer %p, size %lu, memoryType: %u, populateDelayedSubmission",
                        buffer,
                        length,
                        memoryType);

diff --git a/cpp/src/request_tag_multi.cpp b/cpp/src/request_tag_multi.cpp
@@ -1,9 +1,7 @@
 /**
- * SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES.
+ * SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES.
  * SPDX-License-Identifier: BSD-3-Clause
  */
-#include "ucxx/delayed_submission.h"
-#include <functional>
 #include <memory>
 #include <mutex>
 #include <string>
@@ -273,7 +271,7 @@ void RequestTagMulti::recvCallback(ucs_status_t status)
       ucxx_trace_req(
         "RequestTagMulti::recvCallback failed receiving header with status %d (%s), multi request: "
         "%p, "
-        "tag: 0x%lx",
+        "tag: 0x%lx, "
         "tagMask: 0x%lx",
         status,
         ucs_status_string(status),

diff --git a/cpp/src/utils/sockaddr.cpp b/cpp/src/utils/sockaddr.cpp
@@ -1,5 +1,5 @@
 /**
- * SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES.
+ * SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES.
  * SPDX-License-Identifier: BSD-3-Clause
  */
 #include <arpa/inet.h>
@@ -51,13 +51,16 @@ void sockaddr_get_ip_port_str(const struct sockaddr_storage* sockaddr,
       addr_in = reinterpret_cast<decltype(addr_in)>(sockaddr);
       inet_ntop(AF_INET, &addr_in->sin_addr, ip_str, max_str_size);
       snprintf(port_str, max_str_size, "%u", ntohs(addr_in->sin_port));
+      break;
     case AF_INET6:
       addr_in6 = reinterpret_cast<decltype(addr_in6)>(sockaddr);
       inet_ntop(AF_INET6, &addr_in6->sin6_addr, ip_str, max_str_size);
       snprintf(port_str, max_str_size, "%u", ntohs(addr_in6->sin6_port));
+      break;
     default:
-      ip_str   = const_cast<char*>(reinterpret_cast<const char*>("Invalid address family"));
-      port_str = const_cast<char*>(reinterpret_cast<const char*>("Invalid address family"));
+      snprintf(ip_str, max_str_size, "Invalid address family");
+      snprintf(port_str, max_str_size, "Invalid address family");
+      break;
   }
 }
 

diff --git a/cpp/src/worker.cpp b/cpp/src/worker.cpp
@@ -1,5 +1,5 @@
 /**
- * SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES.
+ * SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES.
  * SPDX-License-Identifier: BSD-3-Clause
  */
 #include <functional>
@@ -204,7 +204,9 @@ void Worker::initBlockingProgressMode()
                              }};
 
   err = epoll_ctl(_epollFileDescriptor, EPOLL_CTL_ADD, _workerFileDescriptor, &workerEvent);
-  if (err != 0) throw std::ios_base::failure(std::string("epoll_ctl() returned " + err));
+  if (err != 0) {
+    throw std::ios_base::failure(std::string("epoll_ctl() returned ") + std::to_string(err));
+  }
 }
 
 bool Worker::arm()