BlockStorage/repertory
1
0
Fork 0
Code Issues 8 Pull Requests Releases 6 Wiki Activity

fix directory caching

Browse Source
This commit is contained in:
Scott E. Graves
2024-07-27 07:54:46 -05:00
parent 2a3a0aa689
commit 8655becf1e
9 changed files with 105 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
repertory/librepertory/include/drives/directory_cache.hpp
View File

@ -33,8 +33,9 @@ public:
using execute_callback = std::function<void(directory_iterator &)>;
private:
struct open_directory {
std::shared_ptr<directory_iterator> iterator{};
struct open_directory final {
std::shared_ptr<directory_iterator> iterator;
std::vector<std::uint64_t> handles{};
std::chrono::system_clock::time_point last_update{
std::chrono::system_clock::now()};
};
@ -60,15 +61,15 @@ public:
void execute_action(const std::string &api_path,
const execute_callback &execute);
[[nodiscard]] auto get_directory(directory_iterator *iterator)
-> std::shared_ptr<directory_iterator>;
[[nodiscard]] auto
get_directory(std::uint64_t handle) -> std::shared_ptr<directory_iterator>;
[[nodiscard]] auto remove_directory(const std::string &api_path)
-> std::shared_ptr<directory_iterator>;
void remove_directory(directory_iterator *iterator);
void remove_directory(std::uint64_t handle);
void set_directory(const std::string &api_path,
void set_directory(const std::string &api_path, std::uint64_t handle,
std::shared_ptr<directory_iterator> iterator);
};
} // namespace repertory

6
repertory/librepertory/include/drives/fuse/remotefuse/remote_server.hpp
View File

@ -38,6 +38,7 @@ public:
private:
directory_cache directory_cache_;
std::atomic<std::uint64_t> next_handle_{0U};
private:
[[nodiscard]] auto construct_path(std::string path) -> std::string;
@ -46,6 +47,8 @@ private:
[[nodiscard]] static auto empty_as_zero(const json &data) -> std::string;
[[nodiscard]] auto get_next_handle() -> std::uint64_t;
[[nodiscard]] auto
populate_file_info(const std::string &api_path,
remote::file_info &file_info) -> packet::error_type;
@ -58,9 +61,6 @@ private:
[[nodiscard]] auto update_to_windows_format(json &item) -> json &;
protected:
void delete_open_directory(void *dir) override;
public:
// FUSE Layer
[[nodiscard]] auto fuse_access(const char *path, const std::int32_t &mask)

2
repertory/librepertory/include/drives/remote/remote_open_file_table.hpp
View File

@ -59,8 +59,6 @@ protected:
void close_all(const std::string &client_id);
virtual void delete_open_directory(void *dir) = 0;
#if defined(_WIN32)
[[nodiscard]] auto get_directory_buffer(const native_handle &handle,
PVOID *&buffer) -> bool;

65
repertory/librepertory/include/drives/remote/remote_server_base.hpp
View File

@ -26,9 +26,7 @@
#include "comm/packet/client_pool.hpp"
#include "comm/packet/packet.hpp"
#include "comm/packet/packet_server.hpp"
#include "drives/directory_iterator.hpp"
#include "drives/fuse/remotefuse/i_remote_instance.hpp"
#include "drives/remote/i_remote_json.hpp"
#include "drives/remote/remote_open_file_table.hpp"
#include "drives/winfsp/remotewinfsp/i_remote_instance.hpp"
#include "types/remote.hpp"
@ -546,7 +544,7 @@ public:
remote::file_mode mode;
DECODE_OR_RETURN(request, mode);
return this->fuse_chmod(&path[0], mode);
return this->fuse_chmod(path.c_str(), mode);
}});
handler_lookup_.insert(
{"::fuse_chown",
@ -564,7 +562,7 @@ public:
remote::group_id gid{};
DECODE_OR_RETURN(request, gid);
return this->fuse_chown(&path[0], uid, gid);
return this->fuse_chown(path.c_str(), uid, gid);
}});
handler_lookup_.insert(
{"::fuse_create",
@ -620,8 +618,8 @@ public:
remote::file_handle handle;
DECODE_OR_RETURN(request, handle);
return this->fuse_fallocate(&path[0], mode, offset,
length, handle);
return this->fuse_fallocate(path.c_str(), mode,
offset, length, handle);
}});*/
handler_lookup_.insert(
{"::fuse_fgetattr",
@ -688,7 +686,7 @@ public:
remote::file_handle handle;
DECODE_OR_RETURN(request, handle);
return this->fuse_fsync(&path[0], dataSync, handle);
return this->fuse_fsync(path.c_str(), dataSync, handle);
}});
handler_lookup_.insert(
{"::fuse_ftruncate",
@ -706,7 +704,7 @@ public:
remote::file_handle handle;
DECODE_OR_RETURN(request, handle);
return this->fuse_ftruncate(&path[0], size, handle);
return this->fuse_ftruncate(path.c_str(), size, handle);
}});
handler_lookup_.insert(
{"::fuse_getattr",
@ -726,7 +724,7 @@ public:
remote::stat st{};
bool directory = false;
ret = this->fuse_getattr(&path[0], st, directory);
ret = this->fuse_getattr(path.c_str(), st, directory);
if (ret == 0) {
st.st_uid = uid;
st.st_gid = gid;
@ -749,7 +747,7 @@ public:
remote::file_size size;
DECODE_OR_RETURN(request, size);
return this->fuse_getxattr(&path[0], &name[0],
return this->fuse_getxattr(path.c_str(), &name[0],
nullptr, size);
}});
handlerLookup_.insert({"::fuse_getxattr_osx",
@ -769,8 +767,8 @@ public:
std::uint32_t position;
DECODE_OR_RETURN(request, position);
return this->fuse_getxattr_osx(&path[0], &name[0],
nullptr, size, position);
return this->fuse_getxattr_osx(path.c_str(),
&name[0], nullptr, size, position);
}});*/
handler_lookup_.insert(
{"::fuse_getxtimes",
@ -784,7 +782,8 @@ public:
remote::file_time bkuptime{};
remote::file_time crtime{};
if ((ret = this->fuse_getxtimes(&path[0], bkuptime, crtime)) == 0) {
if ((ret = this->fuse_getxtimes(path.c_str(), bkuptime, crtime)) ==
0) {
response.encode(bkuptime);
response.encode(crtime);
}
@ -807,7 +806,7 @@ public:
remote::file_size size;
DECODE_OR_RETURN(request, size);
return this->fuse_listxattr(&path[0], nullptr,
return this->fuse_listxattr(path.c_str(), nullptr,
size);
}});*/
handler_lookup_.insert(
@ -823,7 +822,7 @@ public:
remote::file_mode mode;
DECODE_OR_RETURN(request, mode);
return this->fuse_mkdir(&path[0], mode);
return this->fuse_mkdir(path.c_str(), mode);
}});
handler_lookup_.insert(
{"::fuse_open",
@ -839,7 +838,7 @@ public:
DECODE_OR_RETURN(request, flags);
remote::file_handle handle;
if ((ret = this->fuse_open(&path[0], flags, handle)) >= 0) {
if ((ret = this->fuse_open(path.c_str(), flags, handle)) >= 0) {
#if defined(_WIN32)
this->set_compat_client_id(handle, client_id);
#else
@ -860,7 +859,7 @@ public:
DECODE_OR_RETURN(request, path);
remote::file_handle handle = 0;
if ((ret = this->fuse_opendir(&path[0], handle)) >= 0) {
if ((ret = this->fuse_opendir(path.c_str(), handle)) >= 0) {
this->add_directory(client_id, reinterpret_cast<void *>(handle));
response.encode(handle);
}
@ -886,10 +885,9 @@ public:
DECODE_OR_RETURN(request, handle);
data_buffer buffer;
if ((ret =
this->fuse_read(&path[0], reinterpret_cast<char *>(&buffer),
read_size, read_offset, handle)) > 0) {
response.encode(&buffer[0], buffer.size());
if ((ret = this->fuse_read(path.c_str(), buffer.data(), read_size,
read_offset, handle)) > 0) {
response.encode(buffer.data(), buffer.size());
}
return ret;
}});
@ -911,10 +909,10 @@ public:
if (this->has_open_directory(client_id,
reinterpret_cast<void *>(handle))) {
std::string filePath;
ret = this->fuse_readdir(&path[0], offset, handle, filePath);
std::string file_path;
ret = this->fuse_readdir(path.c_str(), offset, handle, file_path);
if (ret == 0) {
response.encode(filePath);
response.encode(file_path);
}
} else {
ret = -EBADF;
@ -935,7 +933,7 @@ public:
remote::file_handle handle;
DECODE_OR_RETURN(request, handle);
return this->fuse_release(&path[0], handle);
return this->fuse_release(path.c_str(), handle);
}});
handler_lookup_.insert(
{"::fuse_releasedir",
@ -950,7 +948,7 @@ public:
remote::file_handle handle;
DECODE_OR_RETURN(request, handle);
ret = this->fuse_releasedir(&path[0], handle);
ret = this->fuse_releasedir(path.c_str(), handle);
if (this->remove_directory(client_id,
reinterpret_cast<void *>(handle))) {
return ret;
@ -968,7 +966,8 @@ public:
std::string name;
DECODE_OR_RETURN(request, name);
return this->fuse_removexattr(&path[0], &name[0]);
return this->fuse_removexattr(path.c_str(),
&name[0]);
}});*/
handler_lookup_.insert(
{"::fuse_rename",
@ -1093,7 +1092,7 @@ public:
std::int32_t flags;
DECODE_OR_RETURN(request, flags);
ret = this->fuse_setxattr(&path[0], &name[0],
ret = this->fuse_setxattr(path.c_str(), &name[0],
&value[0], size, flags);
}
return ret;
@ -1125,8 +1124,8 @@ public:
std::uint32_t position;
DECODE_OR_RETURN(request, position);
ret = this->fuse_setxattr_osx(&path[0], &name[0],
&value[0], size, flags, position);
ret = this->fuse_setxattr_osx(path.c_str(),
&name[0], &value[0], size, flags, position);
}
return ret;
}});*/
@ -1430,12 +1429,6 @@ protected:
path = utils::path::create_api_path(path.substr(mount_location_.size()));
return path;
}
void delete_open_directory(void *dir) override {
if (dir != nullptr) {
delete reinterpret_cast<directory_iterator *>(dir);
}
}
};
} // namespace repertory

3
repertory/librepertory/include/drives/winfsp/remotewinfsp/remote_client.hpp
View File

@ -46,9 +46,6 @@ private:
static auto to_handle(PVOID file_desc) -> native_handle;
#endif
protected:
void delete_open_directory(void * /*dir*/) override {}
public:
auto json_create_directory_snapshot(const std::string &path, json &json_data)
-> packet::error_type override;