update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / msg / xio / XioPortal.h

diff --git a/ceph/src/msg/xio/XioPortal.h b/ceph/src/msg/xio/XioPortal.h
index b3f21010095ed0aaa4a91516a31eb9bebcb7502d..7a0afee41931c4a80988a8034ef5975ce312bf6b 100644 (file)
--- a/ceph/src/msg/xio/XioPortal.h
+++ b/ceph/src/msg/xio/XioPortal.h
@@ -27,7 +27,9 @@ extern "C" {
 #include "XioConnection.h"
 #include "XioMsg.h"
 
-#include "include/assert.h"
+#include "include/spinlock.h"
+
+#include "include/ceph_assert.h"
 #include "common/dout.h"
 
 #ifndef CACHE_LINE_SIZE
@@ -47,7 +49,7 @@ private:
     {
       uint32_t size;
       XioSubmit::Queue q;
-      pthread_spinlock_t sp;
+      ceph::spinlock sp;
       CACHE_PAD(0);
     };
 
@@ -62,7 +64,6 @@ private:
 
        for (ix = 0; ix < nlanes; ++ix) {
          lane = &qlane[ix];
-         pthread_spin_init(&lane->sp, PTHREAD_PROCESS_PRIVATE);
          lane->size = 0;
        }
       }
@@ -75,39 +76,36 @@ private:
     void enq(XioConnection *xcon, XioSubmit* xs)
       {
        Lane* lane = get_lane(xcon);
-       pthread_spin_lock(&lane->sp);
+    std::lock_guard<decltype(lane->sp)> lg(lane->sp);
        lane->q.push_back(*xs);
        ++(lane->size);
-       pthread_spin_unlock(&lane->sp);
       }
 
     void enq(XioConnection *xcon, XioSubmit::Queue& requeue_q)
       {
        int size = requeue_q.size();
        Lane* lane = get_lane(xcon);
-       pthread_spin_lock(&lane->sp);
+    std::lock_guard<decltype(lane->sp)> lg(lane->sp);
        XioSubmit::Queue::const_iterator i1 = lane->q.end();
        lane->q.splice(i1, requeue_q);
        lane->size += size;
-       pthread_spin_unlock(&lane->sp);
       }
 
     void deq(XioSubmit::Queue& send_q)
       {
        Lane* lane;
        int cnt;
+
        for (cnt = 0; cnt < nlanes; ++cnt, ++ix, ix = ix % nlanes) {
+      std::lock_guard<decltype(lane->sp)> lg(lane->sp);
          lane = &qlane[ix];
-         pthread_spin_lock(&lane->sp);
          if (lane->size > 0) {
            XioSubmit::Queue::const_iterator i1 = send_q.end();
            send_q.splice(i1, lane->q);
            lane->size = 0;
            ++ix, ix = ix % nlanes;
-           pthread_spin_unlock(&lane->sp);
            break;
          }
-         pthread_spin_unlock(&lane->sp);
        }
       }
 
@@ -117,7 +115,7 @@ private:
   struct xio_context *ctx;
   struct xio_server *server;
   SubmitQueue submit_q;
-  pthread_spinlock_t sp;
+  ceph::spinlock sp;
   void *ev_loop;
   string xio_uri;
   char *portal_id;
@@ -136,8 +134,6 @@ public:
     magic(0),
     special_handling(0)
   {
-    pthread_spin_init(&sp, PTHREAD_PROCESS_PRIVATE);
-
     struct xio_context_params ctx_params;
     memset(&ctx_params, 0, sizeof(ctx_params));
     ctx_params.user_context = this;
@@ -149,7 +145,7 @@ public:
 
     /* a portal is an xio_context and event loop */
     ctx = xio_context_create(&ctx_params, 0 /* poll timeout */, -1 /* cpu hint */);
-    assert(ctx && "Whoops, failed to create portal/ctx");
+    ceph_assert(ctx && "Whoops, failed to create portal/ctx");
   }
 
   int bind(struct xio_session_ops *ops, const string &base_uri,
@@ -219,11 +215,10 @@ public:
       q_iter = send_q.erase(q_iter);
       requeue_q.push_back(*xs);
     }
-    pthread_spin_lock(&xcon->sp);
+    std::lock_guard<decltype(xcon->sp)> lg(xcon->sp);
     XioSubmit::Queue::const_iterator i1 = xcon->outgoing.requeue.begin();
     xcon->outgoing.requeue.splice(i1, requeue_q);
     xcon->cstate.state_flow_controlled(XioConnection::CState::OP_FLAG_LOCKED);
-    pthread_spin_unlock(&xcon->sp);
   }
 
   void *entry()
@@ -241,7 +236,7 @@ public:
        submit_q.deq(send_q);
 
        /* shutdown() barrier */
-       pthread_spin_lock(&sp);
+    std::lock_guard<decltype(sp)> lg(sp);
 
       restart:
        size = send_q.size();
@@ -325,7 +320,6 @@ public:
          } /* while */
        } /* size > 0 */
 
-       pthread_spin_unlock(&sp);
        xio_context_run_loop(ctx, 300);
 
       } while ((!_shutdown) || (!drained));
@@ -340,9 +334,8 @@ public:
 
   void shutdown()
     {
-       pthread_spin_lock(&sp);
+    std::lock_guard<decltype(sp)> lg(sp);
        _shutdown = true;
-       pthread_spin_unlock(&sp);
     }
 };
 
@@ -363,7 +356,7 @@ public:
     for (int i = 0; i < n; i++) {
       if (!portals[i]) {
         portals[i] = new XioPortal(msgr, nconns);
-        assert(portals[i] != nullptr);
+        ceph_assert(portals[i] != nullptr);
       }
     }
   }