X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=src%2Fceph%2Fsrc%2Fmsg%2Fasync%2Fdpdk%2FPacket.cc;fp=src%2Fceph%2Fsrc%2Fmsg%2Fasync%2Fdpdk%2FPacket.cc;h=0000000000000000000000000000000000000000;hb=7da45d65be36d36b880cc55c5036e96c24b53f00;hp=eb4a5dc4ab155c03e8f1bf4d98c42af9153ce885;hpb=691462d09d0987b47e112d6ee8740375df3c51b2;p=stor4nfv.git

diff --git a/src/ceph/src/msg/async/dpdk/Packet.cc b/src/ceph/src/msg/async/dpdk/Packet.cc
deleted file mode 100644
index eb4a5dc..0000000
--- a/src/ceph/src/msg/async/dpdk/Packet.cc
+++ /dev/null
@@ -1,146 +0,0 @@
-// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- 
-/*
- * This file is open source software, licensed to you under the terms
- * of the Apache License, Version 2.0 (the "License").  See the NOTICE file
- * distributed with this work for additional information regarding copyright
- * ownership.  You may not use this file except in compliance with the License.
- *
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Copyright (C) 2014 Cloudius Systems, Ltd.
- */
-/*
- * Ceph - scalable distributed file system
- *
- * Copyright (C) 2015 XSky <haomai@xsky.com>
- *
- * Author: Haomai Wang <haomaiwang@gmail.com>
- *
- * This is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License version 2.1, as published by the Free Software
- * Foundation.  See file COPYING.
- *
- */
-
-#include <iostream>
-#include <algorithm>
-#include <cctype>
-
-#include "capture.h"
-#include "Packet.h"
-
-constexpr size_t Packet::internal_data_size;
-constexpr size_t Packet::default_nr_frags;
-
-void Packet::linearize(size_t at_frag, size_t desired_size) {
-  _impl->unuse_internal_data();
-  size_t nr_frags = 0;
-  size_t accum_size = 0;
-  while (accum_size < desired_size) {
-    accum_size += _impl->frags[at_frag + nr_frags].size;
-    ++nr_frags;
-  }
-  char *new_frag = new char[accum_size];
-  auto p = new_frag;
-  for (size_t i = 0; i < nr_frags; ++i) {
-    auto& f = _impl->frags[at_frag + i];
-    p = std::copy(f.base, f.base + f.size, p);
-  }
-  // collapse nr_frags into one fragment
-  std::copy(_impl->frags + at_frag + nr_frags, _impl->frags + _impl->_nr_frags,
-            _impl->frags + at_frag + 1);
-  _impl->_nr_frags -= nr_frags - 1;
-  _impl->frags[at_frag] = fragment{new_frag, accum_size};
-  if (at_frag == 0 && desired_size == len()) {
-    // We can drop the old buffer safely
-    auto x = std::move(_impl->_deleter);
-    _impl->_deleter = make_deleter([new_frag] { delete []new_frag; });
-  } else {
-    auto del = std::bind(
-            [new_frag](deleter &d) { delete []new_frag; }, std::move(_impl->_deleter));
-    _impl->_deleter = make_deleter(std::move(del));
-  }
-}
-
-class C_free_on_cpu : public EventCallback {
-  deleter del;
-  std::function<void()> cb;
- public:
-  C_free_on_cpu(deleter &&d, std::function<void()> &&c):
-      del(std::move(d)), cb(std::move(c)) {}
-  void do_request(int fd) {
-    // deleter needs to be moved from lambda capture to be destroyed here
-    // otherwise deleter destructor will be called on a cpu that called
-    // create_external_event when work_item is destroyed.
-    deleter xxx(std::move(del));
-    cb();
-    delete this;
-  }
-};
-
-Packet Packet::free_on_cpu(EventCenter *center, std::function<void()> cb)
-{
-  auto del = std::bind(
-      [center, cb] (deleter &del) mutable {
-        center->dispatch_event_external(new C_free_on_cpu(std::move(del), std::move(cb)));
-      }, std::move(_impl->_deleter));
-  // make new deleter that runs old deleter on an origin cpu
-  _impl->_deleter = make_deleter(deleter(), std::move(del));
-
-  return Packet(impl::copy(_impl.get()));
-}
-
-std::ostream& operator<<(std::ostream& os, const Packet& p) {
-  os << "Packet{";
-  bool first = true;
-  for (auto&& frag : p.fragments()) {
-    if (!first) {
-      os << ", ";
-    }
-    first = false;
-    if (std::all_of(frag.base, frag.base + frag.size, [] (int c) { return c >= 9 && c <= 0x7f; })) {
-      os << '"';
-      for (auto p = frag.base; p != frag.base + frag.size; ++p) {
-        auto c = *p;
-        if (isprint(c)) {
-          os << c;
-        } else if (c == '\r') {
-          os << "\\r";
-        } else if (c == '\n') {
-          os << "\\n";
-        } else if (c == '\t') {
-          os << "\\t";
-        } else {
-          uint8_t b = c;
-          os << "\\x" << (b / 16) << (b % 16);
-        }
-      }
-      os << '"';
-    } else {
-      os << "{";
-      bool nfirst = true;
-      for (auto p = frag.base; p != frag.base + frag.size; ++p) {
-        if (!nfirst) {
-          os << " ";
-        }
-        nfirst = false;
-        uint8_t b = *p;
-        os << b;
-      }
-      os << "}";
-    }
-  }
-  os << "}";
-  return os;
-}