Merge pull request #2025 from hioa-cs/v0.13.x

v0.13.x into master
includeos · Jan 23, 2019 · 0efba18 · 0efba18
2 parents 1850d74 + cc87322
commit 0efba18
Show file tree

Hide file tree

Showing 64 changed files with 2,836 additions and 661 deletions.
diff --git a/api/fs/common.hpp b/api/fs/common.hpp
@@ -21,6 +21,7 @@
 
 #include <memory>
 #include <string>
+#include <pmr>
 #include <vector>
 #include "path.hpp"
 #include <common>
@@ -35,12 +36,12 @@ namespace fs {
   /**
    * @brief Shared vector used as a buffer within the filesystem subsystem
    */
-  using buffer_t = std::shared_ptr<std::vector<uint8_t>>;
+  using buffer_t = os::mem::buf_ptr;
 
   /** Construct a shared vector **/
   template <typename... Args>
   buffer_t construct_buffer(Args&&... args) {
-    return std::make_shared<std::vector<uint8_t>> (std::forward<Args> (args)...);
+    return std::make_shared<os::mem::buffer> (std::forward<Args> (args)...);
   }
 
   /** Container types **/

diff --git a/api/hw/block_device.hpp b/api/hw/block_device.hpp
@@ -22,6 +22,7 @@
 #include <cstdint>
 #include <delegate>
 #include <memory>
+#include <pmr>
 #include <vector>
 
 namespace hw {
@@ -32,7 +33,7 @@ namespace hw {
 class Block_device {
 public:
   using block_t       = uint64_t;
-  using buffer_t      = std::shared_ptr<std::vector<uint8_t>>;
+  using buffer_t      = os::mem::buf_ptr;
   using on_read_func  = delegate<void(buffer_t)>;
   using on_write_func = delegate<void(bool error)>;
 
@@ -149,7 +150,7 @@ class Block_device {
    * This functionality is not enabled by default, nor always supported
   **/
   virtual void write(block_t blk, buffer_t, on_write_func) = 0;
-  
+
   virtual bool write_sync(block_t blk, buffer_t) = 0;
 
   /**

diff --git a/api/net/botan/tls_server.hpp b/api/net/botan/tls_server.hpp
@@ -55,6 +55,18 @@ class Server : public Botan::TLS::Callbacks, public net::Stream
     m_transport->on_read(bs, {this, &Server::tls_read});
     this->m_on_read = cb;
   }
+  void on_data(DataCallback cb) override {
+    // FIXME
+    throw std::runtime_error("on_data not implemented on botan::server");
+  }
+  size_t next_size() override {
+    // FIXME
+    throw std::runtime_error("next_size not implemented on botan::server");
+  }
+  buffer_t read_next() override {
+    // FIXME
+    throw std::runtime_error("read_next not implemented on botan::server");
+  }
   void on_write(WriteCallback cb) override {
     this->m_on_write = cb;
   }