From: Haomai Wang <haomaiwang@gmail.com>
Date: Wed, 1 Jul 2015 12:53:35 +0000 (+0800)
Subject: Compressor: Cleanup unnecessary lines
X-Git-Tag: v9.1.0~481^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2cb02736b296087ac2a22b4580f3eeb2bc8f8b14;p=ceph.git

Compressor: Cleanup unnecessary lines

Signed-off-by: Haomai Wang <haomaiwang@gmail.com>
---

diff --git a/src/compressor/AsyncCompressor.cc b/src/compressor/AsyncCompressor.cc
index e2ca2fe48bbf..eafdf7c50fa6 100644
--- a/src/compressor/AsyncCompressor.cc
+++ b/src/compressor/AsyncCompressor.cc
@@ -20,58 +20,6 @@
 #undef dout_prefix
 #define dout_prefix *_dout << "compressor "
 
-//void AsyncCompressor::_compress(bufferlist &in, bufferlist &out)
-//{
-//  uint64_t length = 0;
-//  size_t res_len;
-//  uint64_t left_pbrs = in.buffers().size();
-//  compressor->max_compress_size(in.length(), &res_len);
-//  ldout(cct, 20) << __func__ << " data length=" << in.length() << " got max compressed size is " << res_len << dendl;
-//  bufferptr ptr(res_len);
-//  list<bufferptr>::const_iterator pb = in.buffers().begin();
-//  while (left_pbrs--) {
-//    if (compressor->compress(pb->c_str(), pb->length(), ptr.c_str()+length, &res_len))
-//      assert(0);
-//    ldout(cct, 20) << __func__ << " pb length=" << pb->length() << " compress size is " << res_len << dendl;
-//    out.append(ptr, length, length+res_len);
-//    length += res_len;
-//    pb++;
-//  }
-//  ldout(cct, 20) << __func__ << " total compressed length is " << length << dendl;
-//}
-//
-//void AsyncCompressor::_decompress(bufferlist &in, bufferlist &out)
-//{
-//  int i = 0;
-//  uint64_t length = 0;
-//  size_t res_len;
-//  bufferptr ptr;
-//  vector<uint64_t> lens;
-//  list<bufferptr>::const_iterator pb = in.buffers().begin();
-//  uint64_t left_pbrs = in.buffers().size();
-//  while (left_pbrs--) {
-//    if (compressor->max_uncompress_size(pb->c_str(), pb->length(), &res_len))
-//      assert(0);
-//    length += res_len;
-//    lens.push_back(res_len);
-//    pb++;
-//  }
-//  pb = in.buffers().begin();
-//  left_pbrs = in.buffers().size();
-//  ptr = bufferptr(length);
-//  length = 0;
-//  while (left_pbrs--) {
-//    res_len = lens[i++];
-//    if (compressor->decompress(pb->c_str(), pb->length(), ptr.c_str()+length, &res_len))
-//      assert(0);
-//    ldout(cct, 20) << __func__ << " pb compressed length=" << pb->length() << " actually got decompressed size is " << res_len << dendl;
-//    out.append(ptr, length, length+res_len);
-//    length += res_len;
-//    pb++;
-//  }
-//  ldout(cct, 20) << __func__ << " total decompressed length is " << length << dendl;
-//}
-
 AsyncCompressor::AsyncCompressor(CephContext *c):
   compressor(Compressor::create(c->_conf->async_compressor_type)), cct(c),
   job_id(0),
@@ -154,7 +102,7 @@ int AsyncCompressor::get_compress_data(uint64_t compress_id, bufferlist &data, b
     jobs.erase(it);
     return -EIO;
   } else if (blocking) {
-    if (it->second.status.cas(WAIT, DONE)) {
+    if (it->second.status.compare_and_swap(WAIT, DONE)) {
       ldout(cct, 10) << __func__ << " compress job id=" << compress_id << " hasn't finished, abort!"<< dendl;
       if (compressor->compress(it->second.data, data)) {
         ldout(cct, 1) << __func__ << " compress job id=" << compress_id << " failed!"<< dendl;
@@ -198,7 +146,7 @@ int AsyncCompressor::get_decompress_data(uint64_t decompress_id, bufferlist &dat
     jobs.erase(it);
     return -EIO;
   } else if (blocking) {
-    if (it->second.status.cas(WAIT, DONE)) {
+    if (it->second.status.compare_and_swap(WAIT, DONE)) {
       ldout(cct, 10) << __func__ << " decompress job id=" << decompress_id << " hasn't started, abort!"<< dendl;
       if (compressor->decompress(it->second.data, data)) {
         ldout(cct, 1) << __func__ << " decompress job id=" << decompress_id << " failed!"<< dendl;
diff --git a/src/compressor/AsyncCompressor.h b/src/compressor/AsyncCompressor.h
index 659f506be573..15af92b4e3f6 100644
--- a/src/compressor/AsyncCompressor.h
+++ b/src/compressor/AsyncCompressor.h
@@ -22,7 +22,6 @@
 #include "Compressor.h"
 #include "common/WorkQueue.h"
 
-class AsyncCompressor;
 
 class AsyncCompressor {
  private:
@@ -76,7 +75,7 @@ class AsyncCompressor {
       while (!job_queue.empty()) {
         item = job_queue.front();
         job_queue.pop_front();
-        if (item->status.cas(WAIT, WORKING)) {
+        if (item->status.compare_and_swap(WAIT, WORKING)) {
           break;
         } else {
           Mutex::Locker (async_compressor->job_lock);
@@ -96,7 +95,7 @@ class AsyncCompressor {
         r = async_compressor->compressor->decompress(item->data, out);
       if (!r) {
         item->data.swap(out);
-        assert(item->status.cas(WORKING, DONE));
+        assert(item->status.compare_and_swap(WORKING, DONE));
       } else {
         item->status.set(ERROR);
       }