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

Wip rgw loadgen

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

diff --cc src/rgw/Makefile.am
Simple merge

diff --cc src/rgw/rgw_main.cc
index e27efd6f7d61ecbc93325d845dcdb4ddf5018989,348de5bd87cf380cd2ec56b8541a3d382e4a2b94..c8ed9146d82a48cd6f00076abd1c6b853408bb9e
--- 1/src/rgw/rgw_main.cc
--- 2/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() {

diff --cc src/rgw/rgw_rest.cc
Simple merge