update ceph source to reef 18.1.2

[ceph.git] / ceph / src / rgw / rgw_request.h

diff --git a/ceph/src/rgw/rgw_request.h b/ceph/src/rgw/rgw_request.h
index d332877b153d94701b90afa354bdcfe52da232d5..cd05f51c942422d9a1dae8aab946cb0bb693bf7e 100644 (file)
--- a/ceph/src/rgw/rgw_request.h
+++ b/ceph/src/rgw/rgw_request.h
@@ -1,16 +1,12 @@
 // -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*-
 // vim: ts=8 sw=2 smarttab ft=cpp
 
-#ifndef RGW_REQUEST_H
-#define RGW_REQUEST_H
+#pragma once
 
 #include "rgw_common.h"
 #include "rgw_acl.h"
 #include "rgw_user.h"
 #include "rgw_op.h"
-#if defined(WITH_RADOSGW_FCGI_FRONTEND)
-#include "rgw_fcgi.h"
-#endif
 
 #include "common/QueueRing.h"
 
@@ -19,7 +15,7 @@
 struct RGWRequest
 {
   uint64_t id;
-  struct req_state *s;
+  req_state *s;
   RGWOp *op;
 
   explicit RGWRequest(uint64_t id) : id(id), s(NULL), op(NULL) {}
@@ -31,33 +27,14 @@ struct RGWRequest
   }
 }; /* RGWRequest */
 
-#if defined(WITH_RADOSGW_FCGI_FRONTEND)
-struct RGWFCGXRequest : public RGWRequest {
-  FCGX_Request *fcgx;
-  QueueRing<FCGX_Request *> *qr;
-
-  RGWFCGXRequest(uint64_t req_id, QueueRing<FCGX_Request *> *_qr)
-         : RGWRequest(req_id), qr(_qr) {
-    qr->dequeue(&fcgx);
-  }
-
-  ~RGWFCGXRequest() override {
-    FCGX_Finish_r(fcgx);
-    qr->enqueue(fcgx);
-  }
-};
-#endif
-
 struct RGWLoadGenRequest : public RGWRequest {
-       string method;
-       string resource;
+       std::string method;
+       std::string resource;
        int content_length;
        std::atomic<bool>* fail_flag = nullptr;
 
-RGWLoadGenRequest(uint64_t req_id, const string& _m, const  string& _r, int _cl,
+RGWLoadGenRequest(uint64_t req_id, const std::string& _m, const std::string& _r, int _cl,
                std::atomic<bool> *ff)
        : RGWRequest(req_id), method(_m), resource(_r), content_length(_cl),
                fail_flag(ff) {}
 };
-
-#endif /* RGW_REQUEST_H */