From 9e9a4bb3a78543f6ada98fa4b16509b11026a6d6 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 20 Aug 2018 17:16:23 -0400 Subject: profile_manager: Remove unnecessary std::move in AddToProfiles() and CreateNewUser() Moving a const reference isn't possible, so this just results in a copy (and given ProfileInfo is composed of trivial types and aggregates, a move wouldn't really do anything). --- src/core/hle/service/acc/profile_manager.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/hle/service/acc/profile_manager.cpp') diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp index 62c2121fa..fe9921fb6 100644 --- a/src/core/hle/service/acc/profile_manager.cpp +++ b/src/core/hle/service/acc/profile_manager.cpp @@ -25,7 +25,7 @@ boost::optional ProfileManager::AddToProfiles(const ProfileInfo& user) { if (user_count >= MAX_USERS) { return boost::none; } - profiles[user_count] = std::move(user); + profiles[user_count] = user; return user_count++; } @@ -67,7 +67,7 @@ ResultCode ProfileManager::CreateNewUser(UUID uuid, std::array& userna return ERROR_USER_ALREADY_EXISTS; } ProfileInfo profile; - profile.user_uuid = std::move(uuid); + profile.user_uuid = uuid; profile.username = username; profile.data = {}; profile.creation_time = 0x0; -- cgit v1.2.3 From f13a66b963d4ecd53dda7866e947bc3230566d63 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 20 Aug 2018 17:24:13 -0400 Subject: profile_manager: Move UUID generation function to the cpp file This avoids needing to dump the contents of into other files that include the profile manager header. --- src/core/hle/service/acc/profile_manager.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/core/hle/service/acc/profile_manager.cpp') diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp index fe9921fb6..9440dc555 100644 --- a/src/core/hle/service/acc/profile_manager.cpp +++ b/src/core/hle/service/acc/profile_manager.cpp @@ -2,6 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. +#include #include #include "core/hle/service/acc/profile_manager.h" #include "core/settings.h" @@ -12,6 +13,15 @@ constexpr ResultCode ERROR_TOO_MANY_USERS(ErrorModule::Account, -1); constexpr ResultCode ERROR_USER_ALREADY_EXISTS(ErrorModule::Account, -2); constexpr ResultCode ERROR_ARGUMENT_IS_NULL(ErrorModule::Account, 20); +const UUID& UUID::Generate() { + std::random_device device; + std::mt19937 gen(device()); + std::uniform_int_distribution distribution(1, std::numeric_limits::max()); + uuid[0] = distribution(gen); + uuid[1] = distribution(gen); + return *this; +} + ProfileManager::ProfileManager() { // TODO(ogniK): Create the default user we have for now until loading/saving users is added auto user_uuid = UUID{1, 0}; -- cgit v1.2.3 From 1277556c69a29a6479815b16e3e1707f7e53a422 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 20 Aug 2018 17:32:23 -0400 Subject: profile_manager: Make array parameter to CreateNewUser a const reference This doesn't modify the passed in array, so this can be a const reference. --- src/core/hle/service/acc/profile_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/hle/service/acc/profile_manager.cpp') diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp index 9440dc555..e1ab0e559 100644 --- a/src/core/hle/service/acc/profile_manager.cpp +++ b/src/core/hle/service/acc/profile_manager.cpp @@ -62,7 +62,7 @@ ResultCode ProfileManager::AddUser(ProfileInfo user) { /// Create a new user on the system. If the uuid of the user already exists, the user is not /// created. -ResultCode ProfileManager::CreateNewUser(UUID uuid, std::array& username) { +ResultCode ProfileManager::CreateNewUser(UUID uuid, const std::array& username) { if (user_count == MAX_USERS) { return ERROR_TOO_MANY_USERS; } -- cgit v1.2.3 From f9a26d468c2388269eb63c3baf6c35762c594932 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 20 Aug 2018 17:36:41 -0400 Subject: profile_manager: Take ProfileInfo by const reference where applicable ProfileInfo is quite a large struct in terms of data, and we don't need to perform a copy in these instances, so we can just pass constant references instead. --- src/core/hle/service/acc/profile_manager.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/core/hle/service/acc/profile_manager.cpp') diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp index e1ab0e559..beba92f64 100644 --- a/src/core/hle/service/acc/profile_manager.cpp +++ b/src/core/hle/service/acc/profile_manager.cpp @@ -53,7 +53,7 @@ bool ProfileManager::RemoveProfileAtIndex(size_t index) { } /// Helper function to register a user to the system -ResultCode ProfileManager::AddUser(ProfileInfo user) { +ResultCode ProfileManager::AddUser(const ProfileInfo& user) { if (AddToProfiles(user) == boost::none) { return ERROR_TOO_MANY_USERS; } @@ -112,7 +112,7 @@ boost::optional ProfileManager::GetUserIndex(const UUID& uuid) const { } /// Returns a users profile index based on their profile -boost::optional ProfileManager::GetUserIndex(ProfileInfo user) const { +boost::optional ProfileManager::GetUserIndex(const ProfileInfo& user) const { return GetUserIndex(user.user_uuid); } @@ -135,7 +135,7 @@ bool ProfileManager::GetProfileBase(UUID uuid, ProfileBase& profile) const { } /// Returns the data structure used by the switch when GetProfileBase is called on acc:* -bool ProfileManager::GetProfileBase(ProfileInfo user, ProfileBase& profile) const { +bool ProfileManager::GetProfileBase(const ProfileInfo& user, ProfileBase& profile) const { return GetProfileBase(user.user_uuid, profile); } @@ -221,7 +221,7 @@ bool ProfileManager::GetProfileBaseAndData(UUID uuid, ProfileBase& profile, } /// Return the users profile base and the unknown arbitary data. -bool ProfileManager::GetProfileBaseAndData(ProfileInfo user, ProfileBase& profile, +bool ProfileManager::GetProfileBaseAndData(const ProfileInfo& user, ProfileBase& profile, std::array& data) const { return GetProfileBaseAndData(user.user_uuid, profile, data); } -- cgit v1.2.3 From 38cd4e9c6100cb21c5b8a621d1ee204d61b031ca Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 20 Aug 2018 18:02:16 -0400 Subject: profile_manager: Use type aliases for username data, profile data, and user arrays Avoids the need to repeatedly specify the whole array type in multiple places. --- src/core/hle/service/acc/profile_manager.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/core/hle/service/acc/profile_manager.cpp') diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp index beba92f64..f34f5af97 100644 --- a/src/core/hle/service/acc/profile_manager.cpp +++ b/src/core/hle/service/acc/profile_manager.cpp @@ -62,7 +62,7 @@ ResultCode ProfileManager::AddUser(const ProfileInfo& user) { /// Create a new user on the system. If the uuid of the user already exists, the user is not /// created. -ResultCode ProfileManager::CreateNewUser(UUID uuid, const std::array& username) { +ResultCode ProfileManager::CreateNewUser(UUID uuid, const ProfileUsername& username) { if (user_count == MAX_USERS) { return ERROR_TOO_MANY_USERS; } @@ -89,7 +89,7 @@ ResultCode ProfileManager::CreateNewUser(UUID uuid, const std::array& /// specifically by allowing an std::string for the username. This is required specifically since /// we're loading a string straight from the config ResultCode ProfileManager::CreateNewUser(UUID uuid, const std::string& username) { - std::array username_output; + ProfileUsername username_output; if (username.size() > username_output.size()) { std::copy_n(username.begin(), username_output.size(), username_output.begin()); } else { @@ -178,8 +178,8 @@ void ProfileManager::CloseUser(UUID uuid) { } /// Gets all valid user ids on the system -std::array ProfileManager::GetAllUsers() const { - std::array output; +UserIDArray ProfileManager::GetAllUsers() const { + UserIDArray output; std::transform(profiles.begin(), profiles.end(), output.begin(), [](const ProfileInfo& p) { return p.user_uuid; }); return output; @@ -187,8 +187,8 @@ std::array ProfileManager::GetAllUsers() const { /// Get all the open users on the system and zero out the rest of the data. This is specifically /// needed for GetOpenUsers and we need to ensure the rest of the output buffer is zero'd out -std::array ProfileManager::GetOpenUsers() const { - std::array output; +UserIDArray ProfileManager::GetOpenUsers() const { + UserIDArray output; std::transform(profiles.begin(), profiles.end(), output.begin(), [](const ProfileInfo& p) { if (p.is_open) return p.user_uuid; @@ -205,7 +205,7 @@ UUID ProfileManager::GetLastOpenedUser() const { /// Return the users profile base and the unknown arbitary data. bool ProfileManager::GetProfileBaseAndData(boost::optional index, ProfileBase& profile, - std::array& data) const { + ProfileData& data) const { if (GetProfileBase(index, profile)) { std::memcpy(data.data(), profiles[index.get()].data.data(), MAX_DATA); return true; @@ -215,14 +215,14 @@ bool ProfileManager::GetProfileBaseAndData(boost::optional index, Profil /// Return the users profile base and the unknown arbitary data. bool ProfileManager::GetProfileBaseAndData(UUID uuid, ProfileBase& profile, - std::array& data) const { + ProfileData& data) const { auto idx = GetUserIndex(uuid); return GetProfileBaseAndData(idx, profile, data); } /// Return the users profile base and the unknown arbitary data. bool ProfileManager::GetProfileBaseAndData(const ProfileInfo& user, ProfileBase& profile, - std::array& data) const { + ProfileData& data) const { return GetProfileBaseAndData(user.user_uuid, profile, data); } -- cgit v1.2.3 From 9d8f19d7bf69dd9213c2ced378f8a5e26f3d4d6e Mon Sep 17 00:00:00 2001 From: Lioncash Date: Mon, 20 Aug 2018 18:49:52 -0400 Subject: profile_manager: Remove unnecessary memcpy in GetProfileBaseAndData() Given the source and destination types are the same std::array type, we can simply use regular assignment to perform the same behavior. --- src/core/hle/service/acc/profile_manager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/core/hle/service/acc/profile_manager.cpp') diff --git a/src/core/hle/service/acc/profile_manager.cpp b/src/core/hle/service/acc/profile_manager.cpp index f34f5af97..e0b03d763 100644 --- a/src/core/hle/service/acc/profile_manager.cpp +++ b/src/core/hle/service/acc/profile_manager.cpp @@ -207,7 +207,7 @@ UUID ProfileManager::GetLastOpenedUser() const { bool ProfileManager::GetProfileBaseAndData(boost::optional index, ProfileBase& profile, ProfileData& data) const { if (GetProfileBase(index, profile)) { - std::memcpy(data.data(), profiles[index.get()].data.data(), MAX_DATA); + data = profiles[index.get()].data; return true; } return false; -- cgit v1.2.3