MirrorHub/construct
0
0
Fork 0
mirror of https://github.com/matrix-construct/construct synced 2024-11-17 23:40:57 +01:00
Code Issues Releases Wiki Activity

modules/media: Fix init ordering and decls.

Browse source
This commit is contained in:
Jason Volk 2018-09-05 00:01:39 -07:00
parent 4f0018f6e2
commit 6f3c7b6f56
2 changed files with 64 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
modules/media/media.cc
View file

@ -10,66 +10,6 @@
#include "media.h" #include "media.h"
conf::item<size_t>
media_blocks_cache_size
{
{
{ "name", "ircd.media.blocks.cache.size" },
{ "default", long(48_MiB) },
}, []
{
const size_t &value{media_blocks_cache_size};
db::capacity(db::cache(blocks), value);
}
};
conf::item<size_t>
media_blocks_cache_comp_size
{
{
{ "name", "ircd.media.blocks.cache_comp.size" },
{ "default", long(16_MiB) },
}, []
{
const size_t &value{media_blocks_cache_comp_size};
db::capacity(db::cache_compressed(blocks), value);
}
};
// Blocks column
const db::database::descriptor
media_blocks_descriptor
{
// name
"blocks",
// explain
R"(
Key-value store of blocks belonging to files. The key is a hash of
the block. The key is plaintext sha256-b58 and the block is binary
up to 32768 bytes.
)",
// typing
{
typeid(string_view), typeid(string_view)
},
{}, // options
{}, // comparaor
{}, // prefix transform
-1, // cache size (uses conf item)
-1, // compressed cache size (uses conf item)
};
const db::database::description
media_description
{
{ "default" }, // requirement of RocksDB
media_blocks_descriptor,
};
mapi::header mapi::header
IRCD_MODULE IRCD_MODULE
{ {
@ -96,12 +36,72 @@ media_log
"media" "media"
}; };
// Blocks column
decltype(media_blocks_descriptor)
media_blocks_descriptor
{
// name
"blocks",
// explain
R"(
Key-value store of blocks belonging to files. The key is a hash of
the block. The key is plaintext sha256-b58 and the block is binary
up to 32768 bytes.
)",
// typing
{
typeid(string_view), typeid(string_view)
},
{}, // options
{}, // comparaor
{}, // prefix transform
-1, // cache size (uses conf item)
-1, // compressed cache size (uses conf item)
};
decltype(media_description)
media_description
{
{ "default" }, // requirement of RocksDB
media_blocks_descriptor,
};
decltype(media) decltype(media)
media; media;
decltype(blocks) decltype(blocks)
blocks; blocks;
decltype(media_blocks_cache_size)
media_blocks_cache_size
{
{
{ "name", "ircd.media.blocks.cache.size" },
{ "default", long(48_MiB) },
}, []
{
const size_t &value{media_blocks_cache_size};
db::capacity(db::cache(blocks), value);
}
};
decltype(media_blocks_cache_comp_size)
media_blocks_cache_comp_size
{
{
{ "name", "ircd.media.blocks.cache_comp.size" },
{ "default", long(16_MiB) },
}, []
{
const size_t &value{media_blocks_cache_comp_size};
db::capacity(db::cache_compressed(blocks), value);
}
};
std::set<m::room::id> std::set<m::room::id>
downloading; downloading;

4
modules/media/media.h
View file

@ -12,6 +12,10 @@ using namespace ircd;
extern mapi::header IRCD_MODULE; extern mapi::header IRCD_MODULE;
extern log::log media_log; extern log::log media_log;
extern conf::item<size_t> media_blocks_cache_size;
extern conf::item<size_t> media_blocks_cache_comp_size;
extern const db::database::descriptor media_blocks_descriptor;
extern const db::database::description media_description;
extern std::shared_ptr<db::database> media; extern std::shared_ptr<db::database> media;
extern db::column blocks; extern db::column blocks;