Merge pull request #1390 from AndreasAakesson/dev

fs: Minor changes to memdisk and Disk

Author: fwsGonzo

api/fs/disk.hpp

@@ -23,6 +23,7 @@
 #include <fs/filesystem.hpp>
 #include <fs/dirent.hpp>
 #include <hw/block_device.hpp>
+#include <common>
 
 #include <deque>
 #include <vector>
@@ -129,7 +130,13 @@ namespace fs {
     // Returns a reference to a mounted filesystem
     // If no filesystem is mounted, the results are undefined
     File_system& fs() noexcept
-    { return *filesys; }
+    {
+      if(UNLIKELY(not fs_ready()))
+      {
+        throw Err_not_mounted{"Filesystem not ready - make sure to init_fs before accessing"};
+      }
+      return *filesys;
+    }
 
   private:
     void internal_init(partition_t part, on_init_func func);

api/memdisk

@@ -33,11 +33,17 @@ namespace fs
     return disk;
   }
   // new_shared_memdisk() very likely contains FAT
-  // Note: deprecated!
-  [[deprecated]] inline Disk_ptr new_shared_memdisk()
+  inline Disk_ptr shared_memdisk()
   {
     static MemDisk device;
-    return std::make_shared<Disk> (device);
+    static std::weak_ptr<Disk> disk;
+
+    if(auto ptr = disk.lock())
+      return ptr;
+
+    auto ptr = std::make_shared<Disk>(device);
+    disk = ptr;
+    return ptr;
   }
 }
 

examples/acorn/service.cpp

@@ -51,7 +51,7 @@ void Service::start()
     logger_->log(entry);
   });
 
-  disk = fs::new_shared_memdisk();
+  disk = fs::shared_memdisk();
 
   // init the first legit partition/filesystem
   disk->init_fs(

lib/mana/src/middleware/butler.cpp

@@ -25,7 +25,9 @@ namespace middleware {
 
 Butler::Butler(SharedDisk disk, std::string root, Options opt)
   : disk_(disk), root_(root), options_(opt)
-{}
+{
+  Expects(disk != nullptr && disk->fs_ready());
+}
 
 void Butler::process(mana::Request_ptr req, mana::Response_ptr res, mana::Next next)
 {
@@ -46,12 +48,11 @@ void Butler::process(mana::Request_ptr req, mana::Response_ptr res, mana::Next n
   // concatenate root with path, example: / => /public/
   path = root_ + path;
 
-
   // no extension found
   if(ext.empty() and !options_.index.empty()) {
     if(path.back() != '/') path += '/';
     // lets try to see if we can serve an index
-    path += options_.index[0]; // only check first one for now, else we have to use fs().ls
+    path += options_.index.at(0); // only check first one for now, else we have to use fs().ls
     disk_->fs().cstat(
       path,
       fs::on_stat_func::make_packed(

mod/rapidjson

@@ -27,7 +27,7 @@
 void Service::start(const std::string&)
 {
   INFO("FAT16", "Running tests for FAT16");
-  auto disk = fs::new_shared_memdisk();
+  auto disk = fs::shared_memdisk();
   assert(disk);
 
   // verify that the size is indeed N sectors
@@ -72,7 +72,7 @@ void Service::start(const std::string&)
     // try reading banana-file
     auto buf = fs.read(ent, 0, ent.size());
     CHECKSERT(!buf.error(), "No error reading file");
-    
+
     auto banana = buf.to_string();
 
     CHECKSERT(banana == internal_banana, "Correct banana #1");

test/fs/integration/fat16/fat16.cpp

@@ -26,7 +26,7 @@ const uint64_t SIZE = 256000;
 void Service::start(const std::string&)
 {
   INFO("MemDisk", "Running tests for MemDisk");
-  auto disk = fs::new_shared_memdisk();
+  auto disk = fs::shared_memdisk();
   CHECKSERT(disk, "Created shared memdisk");
 
   CHECKSERT(not disk->empty(), "Disk is not empty");

test/fs/integration/memdisk/bigdisk.cpp

@@ -24,7 +24,7 @@
 void Service::start(const std::string&)
 {
   INFO("MemDisk", "Running tests for MemDisk");
-  auto disk = fs::new_shared_memdisk();
+  auto disk = fs::shared_memdisk();
   CHECKSERT(disk, "Created shared memdisk");
 
   // verify that the size is indeed 0 sectors

test/fs/integration/memdisk/nosector.cpp

@@ -25,7 +25,7 @@
 void Service::start(const std::string&)
 {
   INFO("MemDisk", "Running tests for MemDisk");
-  auto disk = fs::new_shared_memdisk();
+  auto disk = fs::shared_memdisk();
   CHECKSERT(disk, "Created shared memdisk");
 
   CHECKSERT(not disk->empty(), "Disk is not empty");

test/fs/integration/memdisk/twosector.cpp

@@ -57,7 +57,7 @@ struct Thing2 {
 
 
 fs::File_system& memdisk() {
-  static auto disk = fs::new_shared_memdisk();
+  static auto disk = fs::shared_memdisk();
 
   if (not disk->fs_ready())
   {