From: Yehuda Sadeh <yehuda@inktank.com>
Date: Fri, 17 Jan 2014 18:24:18 +0000 (-0800)
Subject: Merge pull request #1092 from ceph/wip-rgw-loadgen
X-Git-Tag: v0.78~307
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=184e64d0730a570e77e3444e471537aad510857c;p=ceph.git

Merge pull request #1092 from ceph/wip-rgw-loadgen

Wip rgw loadgen

Reviewed-by: Sage Weil <sage@inktank.com>
---

184e64d0730a570e77e3444e471537aad510857c
diff --cc src/rgw/rgw_main.cc
index e27efd6f7d61,348de5bd87cf..c8ed9146d82a
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@@ -666,17 -833,14 +831,15 @@@ protected
    RGWFrontendConfig *conf;
    RGWProcess *pprocess;
    RGWProcessEnv env;
-   RGWFCGXControlThread *thread;
+   RGWProcessControlThread *thread;
  
  public:
-   RGWFCGXFrontend(RGWProcessEnv& pe, RGWFrontendConfig *_conf) : conf(_conf), env(pe) {
-     pprocess = new RGWProcess(g_ceph_context, &env, g_conf->rgw_thread_pool_size, conf);
-     thread = new RGWFCGXControlThread(pprocess);
+   RGWProcessFrontend(RGWProcessEnv& pe, RGWFrontendConfig *_conf) : conf(_conf), pprocess(NULL), env(pe), thread(NULL) {
    }
  
-   ~RGWFCGXFrontend() {
+   ~RGWProcessFrontend() {
      delete thread;
 +    delete pprocess;
    }
  
    int run() {