Tidy includes. (#74)

Signed-off-by: Samuel K. Gutierrez <samuel@lanl.gov>
hpc · Feb 14, 2024 · 3557d95 · 3557d95
1 parent 26c935f
commit 3557d95
Show file tree

Hide file tree

Showing 39 changed files with 103 additions and 111 deletions.
diff --git a/src/quo-vadis-mpi.cc b/src/quo-vadis-mpi.cc
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2020-2022 Triad National Security, LLC
+ * Copyright (c) 2020-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * Copyright (c) 2020-2021 Lawrence Livermore National Security, LLC
@@ -14,15 +14,14 @@
  * @file quo-vadis-mpi.cc
  */
 
-#include "qvi-common.h"
+#include "qvi-common.h" // IWYU pragma: keep
 
 #include "quo-vadis-mpi.h"
 
 #include "qvi-context.h"
 #include "qvi-group-mpi.h"
 #include "qvi-zgroup-mpi.h"
 #include "qvi-scope.h"
-#include "qvi-utils.h"
 
 /**
  * Simply a wrapper for our Fortran interface to C interface. No need to expose

diff --git a/src/quo-vadis-process.cc b/src/quo-vadis-process.cc
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2020-2022 Triad National Security, LLC
+ * Copyright (c) 2020-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * This file is part of the quo-vadis project. See the LICENSE file at the
@@ -11,13 +11,12 @@
  * @file quo-vadis-process.cc
  */
 
-#include "qvi-common.h"
+#include "qvi-common.h" // IWYU pragma: keep
 
 #include "quo-vadis-process.h"
 
 #include "qvi-context.h"
 #include "qvi-zgroup-process.h"
-#include "qvi-group-process.h"
 
 int
 qv_process_context_free(

diff --git a/src/quo-vadis-thread.cc b/src/quo-vadis-thread.cc
@@ -1,6 +1,6 @@
  /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2020-2023 Triad National Security, LLC
+ * Copyright (c) 2020-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * Copyright (c) Inria 2022-2023.  All rights reserved.
@@ -14,13 +14,13 @@
  * @file quo-vadis-thread.cc
  */
 
-#include "qvi-common.h"
+#include "qvi-common.h" // IWYU pragma: keep
 
 #include "quo-vadis-thread.h"
 
 #include "qvi-context.h"
 #include "qvi-zgroup-thread.h"
-#include "qvi-group-thread.h"
+#include "qvi-group-thread.h" // IWYU pragma: keep
 #include "qvi-scope.h"
 
 #ifdef OPENMP_FOUND

diff --git a/src/quo-vadis.cc b/src/quo-vadis.cc
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2020-2023 Triad National Security, LLC
+ * Copyright (c) 2020-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * Copyright (c) 2020-2021 Lawrence Livermore National Security, LLC
@@ -14,11 +14,10 @@
  * @file quo-vadis.cc
  */
 
-#include "qvi-common.h"
+#include "qvi-common.h" // IWYU pragma: keep
 
-#include "qvi-context.h"
+#include "qvi-context.h" // IWYU pragma: keep
 #include "qvi-scope.h"
-#include "qvi-utils.h"
 
 int
 qv_version(

diff --git a/src/qvi-bbuff.h b/src/qvi-bbuff.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2020-2022 Triad National Security, LLC
+ * Copyright (c) 2020-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * Copyright (c) 2020-2021 Lawrence Livermore National Security, LLC
@@ -19,7 +19,7 @@
 #ifndef QVI_BBUFF_H
 #define QVI_BBUFF_H
 
-#include "qvi-common.h"
+#include "qvi-common.h" // IWYU pragma: keep
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/qvi-bind.cc b/src/qvi-bind.cc
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2021-2023 Triad National Security, LLC
+ * Copyright (c) 2021-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * Copyright (c)      2021 Lawrence Livermore National Security, LLC
@@ -14,7 +14,7 @@
  * @file qvi-bind.cc
  */
 
-#include "qvi-common.h"
+#include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-bind.h"
 
 using qvi_bind_bitmap_stack_t = std::stack<hwloc_cpuset_t>;

diff --git a/src/qvi-bind.h b/src/qvi-bind.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c)      2021 Triad National Security, LLC
+ * Copyright (c) 2021-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * Copyright (c)      2021 Lawrence Livermore National Security, LLC
@@ -19,9 +19,9 @@
 #ifndef QVI_BIND_H
 #define QVI_BIND_H
 
-#include "qvi-common.h"
+#include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-task.h"
-#include "qvi-hwloc.h"
+#include "qvi-hwloc.h" // IWYU pragma: keep
 #include "qvi-rmi.h"
 
 #ifdef __cplusplus

diff --git a/src/qvi-common.h b/src/qvi-common.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2020-2023 Triad National Security, LLC
+ * Copyright (c) 2020-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * Copyright (c) 2020-2021 Lawrence Livermore National Security, LLC
@@ -17,22 +17,22 @@
 #ifndef QVI_COMMON_H
 #define QVI_COMMON_H
 
-#include "quo-vadis/config.h"
-#include "qvi-macros.h"
-#include "quo-vadis.h"
+#include "quo-vadis/config.h" // IWYU pragma: keep
+#include "qvi-macros.h" // IWYU pragma: keep
+#include "quo-vadis.h" // IWYU pragma: keep
 
-#include <assert.h>
-#include <errno.h>
+#include <assert.h> // IWYU pragma: keep
+#include <errno.h> // IWYU pragma: keep
 #include <fcntl.h>
-#include <inttypes.h>
-#include <limits.h>
+#include <inttypes.h> // IWYU pragma: keep
+#include <limits.h> // IWYU pragma: keep
 #include <pthread.h>
-#include <stdarg.h>
+#include <stdarg.h> // IWYU pragma: keep
 #include <stdbool.h>
 #include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
+#include <stdio.h> // IWYU pragma: keep
+#include <stdlib.h> // IWYU pragma: keep
+#include <string.h> // IWYU pragma: keep
 #include <sys/resource.h>
 #include <sys/stat.h>
 #include <sys/syscall.h>
@@ -41,18 +41,18 @@
 #include <unistd.h>
 
 #ifdef __cplusplus
-#include "qvi-log.h"
-
-#include <chrono>
-#include <map>
-#include <new>
-#include <set>
-#include <stack>
-#include <stdexcept>
-#include <thread>
-#include <unordered_map>
-#include <unordered_set>
-#include <vector>
+#include "qvi-log.h" // IWYU pragma: keep
+ // IWYU pragma: keep
+#include <chrono> // IWYU pragma: keep
+#include <map> // IWYU pragma: keep
+#include <new> // IWYU pragma: keep
+#include <set> // IWYU pragma: keep
+#include <stack> // IWYU pragma: keep
+#include <stdexcept> // IWYU pragma: keep
+#include <thread> // IWYU pragma: keep
+#include <unordered_map> // IWYU pragma: keep
+#include <unordered_set> // IWYU pragma: keep
+#include <vector> // IWYU pragma: keep
 #endif
 
 typedef uint8_t byte_t;

diff --git a/src/qvi-context.cc b/src/qvi-context.cc
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2020-2022 Triad National Security, LLC
+ * Copyright (c) 2020-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * Copyright (c) 2020-2021 Lawrence Livermore National Security, LLC
@@ -14,7 +14,7 @@
  * @file qvi-context.cc
  */
 
-#include "qvi-common.h"
+#include "qvi-common.h" // IWYU pragma: keep
 
 #include "qvi-context.h"
 

diff --git a/src/qvi-context.h b/src/qvi-context.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2020-2022 Triad National Security, LLC
+ * Copyright (c) 2020-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * Copyright (c) 2020-2021 Lawrence Livermore National Security, LLC
@@ -22,7 +22,7 @@
 #ifndef QVI_CONTEXT_H
 #define QVI_CONTEXT_H
 
-#include "qvi-common.h"
+#include "qvi-common.h" // IWYU pragma: keep
 
 #include "qvi-rmi.h"
 #include "qvi-zgroup.h"

diff --git a/src/qvi-group-mpi.cc b/src/qvi-group-mpi.cc
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2020-2022 Triad National Security, LLC
+ * Copyright (c) 2020-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * Copyright (c) 2020-2021 Lawrence Livermore National Security, LLC
@@ -14,7 +14,7 @@
  * @file qvi-group-mpi.cc
  */
 
-#include "qvi-common.h"
+#include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-group-mpi.h"
 
 qvi_group_mpi_s::~qvi_group_mpi_s(void)

diff --git a/src/qvi-group-process.cc b/src/qvi-group-process.cc
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c)      2022 Triad National Security, LLC
+ * Copyright (c) 2022-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * This file is part of the quo-vadis project. See the LICENSE file at the
@@ -11,7 +11,7 @@
  * @file qvi-group-process.cc
  */
 
-#include "qvi-common.h"
+#include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-group-process.h"
 
 qvi_group_process_s::~qvi_group_process_s(void)

diff --git a/src/qvi-group-thread.cc b/src/qvi-group-thread.cc
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2022      Triad National Security, LLC
+ * Copyright (c) 2022-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * Copyright (c) 2022      Inria.
@@ -17,7 +17,7 @@
  * @file qvi-group-thread.cc
  */
 
-#include "qvi-common.h"
+#include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-group-thread.h"
 
 qvi_group_thread_s::~qvi_group_thread_s(void)

diff --git a/src/qvi-group.cc b/src/qvi-group.cc
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2022      Triad National Security, LLC
+ * Copyright (c) 2022-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * This file is part of the quo-vadis project. See the LICENSE file at the
@@ -11,7 +11,7 @@
  * @file qvi-group.cc
  */
 
-#include "qvi-common.h"
+#include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-group.h"
 #include "qvi-log.h"
 

diff --git a/src/qvi-hwloc.h b/src/qvi-hwloc.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2020-2023 Triad National Security, LLC
+ * Copyright (c) 2020-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * Copyright (c) 2020-2021 Lawrence Livermore National Security, LLC
@@ -20,7 +20,7 @@
 #include "qvi-common.h"
 #include "qvi-task.h"
 
-#include "hwloc.h"
+#include "hwloc.h" // IWYU pragma: keep
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/qvi-line.cc b/src/qvi-line.cc
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2020-2022 Triad National Security, LLC
+ * Copyright (c) 2020-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * This file is part of the quo-vadis project. See the LICENSE file at the
@@ -14,11 +14,11 @@
  * More generally, they are types that can be easily serialized.
  */
 
-#include "qvi-common.h"
+#include "qvi-common.h" // IWYU pragma: keep
 
 #include "qvi-line.h"
 #include "qvi-bbuff-rmi.h"
-#include "qvi-utils.h"
+#include "qvi-utils.h" // IWYU pragma: keep
 
 int
 qvi_line_config_new(

diff --git a/src/qvi-line.h b/src/qvi-line.h
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2022-2023 Triad National Security, LLC
+ * Copyright (c) 2022-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * This file is part of the quo-vadis project. See the LICENSE file at the
@@ -17,7 +17,7 @@
 #ifndef QVI_LINE_H
 #define QVI_LINE_H
 
-#include "qvi-common.h"
+#include "qvi-common.h" // IWYU pragma: keep
 
 #include "qvi-bbuff.h"
 #include "qvi-hwloc.h"

diff --git a/src/qvi-log.cc b/src/qvi-log.cc
@@ -1,6 +1,6 @@
 /* -*- Mode: C++; c-basic-offset:4; indent-tabs-mode:nil -*- */
 /*
- * Copyright (c) 2020-2022 Triad National Security, LLC
+ * Copyright (c) 2020-2024 Triad National Security, LLC
  *                         All rights reserved.
  *
  * Copyright (c) 2020-2021 Lawrence Livermore National Security, LLC
@@ -14,7 +14,7 @@
  * @file qvi-log.cc
  */
 
-#include "qvi-common.h"
+#include "qvi-common.h" // IWYU pragma: keep
 #include "qvi-log.h"
 
 #include "spdlog/sinks/stdout_sinks.h"