andreacavalli/tdlib-fork
Archived
1
0
Fork 0
Code Pull Requests Releases Activity

Oprimize sizeof(FileNode).

Browse Source 
GitOrigin-RevId: 2ba7e468e4eae6a398418d6cd8db7f2905594535
This commit is contained in:
levlam 2018-01-20 13:49:06 +03:00
parent 5895f817d8
commit 271ab50403
2 changed files with 27 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
td/telegram/files/FileManager.cpp
View File

@ -318,7 +318,7 @@ const string &FileView::name() const {
return node_->name_; return node_->name_;
} }
const DialogId &FileView::owner_dialog_id() const { DialogId FileView::owner_dialog_id() const {
return node_->owner_dialog_id_; return node_->owner_dialog_id_;
} }
@ -779,7 +779,7 @@ static int merge_choose_owner(DialogId x, DialogId y) {
return 2; return 2;
} }
static int merge_choose_main_file_id(FileId a, int32 a_priority, FileId b, int32 b_priority) { static int merge_choose_main_file_id(FileId a, int8 a_priority, FileId b, int8 b_priority) {
if (a_priority != b_priority) { if (a_priority != b_priority) {
return a_priority < b_priority; return a_priority < b_priority;
} }

41
td/telegram/files/FileManager.h
View File

@ -29,12 +29,14 @@
#include <utility> #include <utility>
namespace td { namespace td {
enum class FileLocationSource : int { None, FromUser, FromDb, FromServer };
enum class FileLocationSource : int8 { None, FromUser, FromDb, FromServer };
class FileNode { class FileNode {
public: public:
FileNode(LocalFileLocation local, RemoteFileLocation remote, GenerateFileLocation generate, int64 size, FileNode(LocalFileLocation local, RemoteFileLocation remote, GenerateFileLocation generate, int64 size,
int64 expected_size, string name, string url, DialogId owner_dialog_id, FileEncryptionKey key, int64 expected_size, string name, string url, DialogId owner_dialog_id, FileEncryptionKey key,
FileId main_file_id, int main_file_id_priority) FileId main_file_id, int8 main_file_id_priority)
: local_(std::move(local)) : local_(std::move(local))
, remote_(std::move(remote)) , remote_(std::move(remote))
, generate_(std::move(generate)) , generate_(std::move(generate))
@ -77,40 +79,47 @@ class FileNode {
LocalFileLocation local_; LocalFileLocation local_;
FileLoadManager::QueryId upload_id_ = 0; FileLoadManager::QueryId upload_id_ = 0;
int32 upload_priority_ = 0;
FileId upload_pause_;
int64 local_ready_size_ = 0; int64 local_ready_size_ = 0;
RemoteFileLocation remote_; RemoteFileLocation remote_;
FileLocationSource remote_source_ = FileLocationSource::FromUser;
FileLoadManager::QueryId download_id_ = 0; FileLoadManager::QueryId download_id_ = 0;
int32 download_priority_ = 0;
int64 remote_ready_size_ = 0; int64 remote_ready_size_ = 0;
bool is_download_started_ = false;
GenerateFileLocation generate_; GenerateFileLocation generate_;
FileLoadManager::QueryId generate_id_ = 0; FileLoadManager::QueryId generate_id_ = 0;
bool generate_was_update_ = false;
int32 generate_priority_ = 0;
int32 generate_download_priority_ = 0;
int32 generate_upload_priority_ = 0;
BufferSlice content_; BufferSlice content_;
int64 size_ = 0; int64 size_ = 0;
int64 expected_size_ = 0; int64 expected_size_ = 0;
string name_ = ""; string name_;
string url_ = ""; string url_;
DialogId owner_dialog_id_; DialogId owner_dialog_id_;
FileEncryptionKey encryption_key_; FileEncryptionKey encryption_key_;
bool need_load_from_pmc_ = false;
FileDbId pmc_id_ = 0; FileDbId pmc_id_ = 0;
std::vector<FileId> file_ids_; std::vector<FileId> file_ids_;
FileId main_file_id_; FileId main_file_id_;
int main_file_id_priority_ = 0;
FileId upload_pause_;
int32 upload_priority_ = 0;
int32 download_priority_ = 0;
int32 generate_priority_ = 0;
int32 generate_download_priority_ = 0;
int32 generate_upload_priority_ = 0;
int8 main_file_id_priority_ = 0;
FileLocationSource remote_source_ = FileLocationSource::FromUser;
bool get_by_hash_ = false; bool get_by_hash_ = false;
bool is_download_started_ = false;
bool generate_was_update_ = false;
bool need_load_from_pmc_ = false;
bool pmc_changed_flag_{false}; bool pmc_changed_flag_{false};
bool info_changed_flag_{false}; bool info_changed_flag_{false};
}; };
@ -134,7 +143,7 @@ class FileView {
const string &name() const; const string &name() const;
const DialogId &owner_dialog_id() const; DialogId owner_dialog_id() const;
bool get_by_hash() const; bool get_by_hash() const;