librbd: moved performance counter enums to common location

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 2224e5ca1dacef1e3f8ec4854f08b4abe86f5d75)

Conflicts:
	src/librbd/internal.h: trivial resolution

diff --git a/src/librbd/ImageCtx.cc b/src/librbd/ImageCtx.cc
index 3918a768181904417293e75228114bcaba08510d..e71aee82b649307b391516230fdb0e5a096c394b 100644 (file)
--- a/src/librbd/ImageCtx.cc
+++ b/src/librbd/ImageCtx.cc
@@ -22,6 +22,7 @@
 #include "librbd/ObjectMap.h"
 #include "librbd/Operations.h"
 #include "librbd/operation/ResizeRequest.h"
+#include "librbd/Types.h"
 #include "librbd/Utils.h"
 #include "librbd/LibrbdWriteback.h"
 #include "librbd/exclusive_lock/AutomaticPolicy.h"

diff --git a/src/librbd/ImageWatcher.cc b/src/librbd/ImageWatcher.cc
index 487eabaa69c18f5c7b374362982ce071b40de1b2..f8ffda4a75c624719b8c78997754411df33b90ab 100644 (file)
--- a/src/librbd/ImageWatcher.cc
+++ b/src/librbd/ImageWatcher.cc
@@ -8,6 +8,7 @@
 #include "librbd/internal.h"
 #include "librbd/Operations.h"
 #include "librbd/TaskFinisher.h"
+#include "librbd/Types.h"
 #include "librbd/Utils.h"
 #include "librbd/exclusive_lock/Policy.h"
 #include "librbd/image_watcher/NotifyLockOwner.h"

diff --git a/src/librbd/Operations.cc b/src/librbd/Operations.cc
index 65dea8f8c41ee1e7a5abb138bc8f16a816898d40..f6073b5787759ee164aab78d07e22ff1886d5b26 100644 (file)
--- a/src/librbd/Operations.cc
+++ b/src/librbd/Operations.cc
@@ -12,6 +12,7 @@
 #include "librbd/ImageState.h"
 #include "librbd/ImageWatcher.h"
 #include "librbd/ObjectMap.h"
+#include "librbd/Types.h"
 #include "librbd/Utils.h"
 #include "librbd/journal/DisabledPolicy.h"
 #include "librbd/journal/StandardPolicy.h"

diff --git a/src/librbd/Types.h b/src/librbd/Types.h
index 8efe8a7763c421064b25823cca5369db804d3c8b..181ee5310d464b70d44dae912c4bf2a43da3f804 100644 (file)
--- a/src/librbd/Types.h
+++ b/src/librbd/Types.h
@@ -10,6 +10,47 @@
 
 namespace librbd {
 
+// Performance counters
+enum {
+  l_librbd_first = 26000,
+
+  l_librbd_rd,               // read ops
+  l_librbd_rd_bytes,         // bytes read
+  l_librbd_rd_latency,       // average latency
+  l_librbd_wr,
+  l_librbd_wr_bytes,
+  l_librbd_wr_latency,
+  l_librbd_discard,
+  l_librbd_discard_bytes,
+  l_librbd_discard_latency,
+  l_librbd_flush,
+
+  l_librbd_aio_flush,
+  l_librbd_aio_flush_latency,
+  l_librbd_ws,
+  l_librbd_ws_bytes,
+  l_librbd_ws_latency,
+
+  l_librbd_cmp,
+  l_librbd_cmp_bytes,
+  l_librbd_cmp_latency,
+
+  l_librbd_snap_create,
+  l_librbd_snap_remove,
+  l_librbd_snap_rollback,
+  l_librbd_snap_rename,
+
+  l_librbd_notify,
+  l_librbd_resize,
+
+  l_librbd_readahead,
+  l_librbd_readahead_bytes,
+
+  l_librbd_invalidate_cache,
+
+  l_librbd_last,
+};
+
 /** @brief Unique identification of a parent in clone relationship.
  * Cloning an image creates a child image that keeps a reference
  * to its parent. This allows copy-on-write images. */

diff --git a/src/librbd/internal.h b/src/librbd/internal.h
index 72633f592ca3b9c08ae8f611c3b132f4b31b9dfc..c8ef7dca1bfd93bbad4e20a149094856286866ba 100644 (file)
--- a/src/librbd/internal.h
+++ b/src/librbd/internal.h
@@ -17,46 +17,6 @@
 #include "common/WorkQueue.h"
 #include "librbd/Types.h"
 
-enum {
-  l_librbd_first = 26000,
-
-  l_librbd_rd,               // read ops
-  l_librbd_rd_bytes,         // bytes read
-  l_librbd_rd_latency,       // average latency
-  l_librbd_wr,
-  l_librbd_wr_bytes,
-  l_librbd_wr_latency,
-  l_librbd_discard,
-  l_librbd_discard_bytes,
-  l_librbd_discard_latency,
-  l_librbd_flush,
-
-  l_librbd_aio_flush,
-  l_librbd_aio_flush_latency,
-  l_librbd_ws,
-  l_librbd_ws_bytes,
-  l_librbd_ws_latency,
-
-  l_librbd_cmp,
-  l_librbd_cmp_bytes,
-  l_librbd_cmp_latency,
-
-  l_librbd_snap_create,
-  l_librbd_snap_remove,
-  l_librbd_snap_rollback,
-  l_librbd_snap_rename,
-
-  l_librbd_notify,
-  l_librbd_resize,
-
-  l_librbd_readahead,
-  l_librbd_readahead_bytes,
-
-  l_librbd_invalidate_cache,
-
-  l_librbd_last,
-};
-
 namespace librbd {
 
   struct ImageCtx;

diff --git a/src/librbd/io/AioCompletion.cc b/src/librbd/io/AioCompletion.cc
index 1dc6280959c2e261c7505374088da5bc98adec52..d58d4f35597cdecb60a0227d8533fdefc37dbf5b 100644 (file)
--- a/src/librbd/io/AioCompletion.cc
+++ b/src/librbd/io/AioCompletion.cc
@@ -12,8 +12,8 @@
 
 #include "librbd/ImageCtx.h"
 #include "librbd/internal.h"
-
 #include "librbd/Journal.h"
+#include "librbd/Types.h"
 
 #ifdef WITH_LTTNG
 #include "tracing/librbd.h"

diff --git a/src/librbd/io/ImageRequest.cc b/src/librbd/io/ImageRequest.cc
index 434c208eefd1b56679988f9f1a1505251d063124..c9a577e735fe0fb5f3cadfcb4b9fa8b940bcc8a6 100644 (file)
--- a/src/librbd/io/ImageRequest.cc
+++ b/src/librbd/io/ImageRequest.cc
@@ -5,6 +5,7 @@
 #include "librbd/ImageCtx.h"
 #include "librbd/internal.h"
 #include "librbd/Journal.h"
+#include "librbd/Types.h"
 #include "librbd/Utils.h"
 #include "librbd/cache/ImageCache.h"
 #include "librbd/io/AioCompletion.h"