From: Kefu Chai <kchai@redhat.com>
Date: Thu, 25 Feb 2016 06:26:39 +0000 (+0800)
Subject: librados: add missing tracpoint for scrub APIs
X-Git-Tag: v10.1.0~300^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ac7d11ad73d4fc706fb8ea82b31ad740a5d236a0;p=ceph.git

librados: add missing tracpoint for scrub APIs

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/librados/librados.cc b/src/librados/librados.cc
index dc067aaa303..f9931e8b325 100644
--- a/src/librados/librados.cc
+++ b/src/librados/librados.cc
@@ -2853,7 +2853,7 @@ extern "C" int rados_pool_list(rados_t cluster, char *buf, size_t len)
 CEPH_RADOS_API int rados_inconsistent_pg_list(rados_t cluster, int64_t pool_id,
 					      char *buf, size_t len)
 {
-  tracepoint(librados, rados_inconsistent_pg_list_enter, cluster, len);
+  tracepoint(librados, rados_inconsistent_pg_list_enter, cluster, pool_id, len);
   librados::RadosClient *client = (librados::RadosClient *)cluster;
   std::vector<librados::PlacementGroup> pgs;
   int r = ::get_inconsistent_pgs(*client, pool_id, &pgs);
@@ -2877,7 +2877,7 @@ CEPH_RADOS_API int rados_inconsistent_pg_list(rados_t cluster, int64_t pool_id,
     auto s = ss.str();
     unsigned rl = s.length() + 1;
     if (len >= rl) {
-      tracepoint(librados, rados_inconsistent_pg_list_pg, p);
+      tracepoint(librados, rados_inconsistent_pg_list_pg, s.c_str());
       strncat(b, s.c_str(), rl);
       b += rl;
       len -= rl;
diff --git a/src/tracing/librados.tp b/src/tracing/librados.tp
index 1ffebdd7a74..4e0c839bd41 100644
--- a/src/tracing/librados.tp
+++ b/src/tracing/librados.tp
@@ -3500,3 +3500,31 @@ TRACEPOINT_EVENT(librados, rados_cache_unpin_exit,
         ctf_integer(int, retval, retval)
     )
 )
+
+TRACEPOINT_EVENT(librados, rados_inconsistent_pg_list_enter,
+    TP_ARGS(
+        rados_t, cluster,
+        int64_t, id,
+        size_t, maxlen),
+    TP_FIELDS(
+        ctf_integer_hex(rados_t, cluster, cluster)
+        ctf_integer(int64_t, id, id)
+        ctf_integer(size_t, maxlen, maxlen)
+    )
+)
+
+TRACEPOINT_EVENT(librados, rados_inconsistent_pg_list_pg,
+    TP_ARGS(
+        const char*, buf),
+    TP_FIELDS(
+        ctf_string(buf, buf)
+    )
+)
+
+TRACEPOINT_EVENT(librados, rados_inconsistent_pg_list_exit,
+    TP_ARGS(
+        int, retval),
+    TP_FIELDS(
+        ctf_integer(int, retval, retval)
+    )
+)