hw05

main.cpp

@@ -6,84 +6,141 @@
 #include <string>
 #include <thread>
 #include <map>
+#include <chrono>
+#include <mutex>
+#include <shared_mutex>
+#include <vector>
 
 
 struct User {
-    std::string password;
-    std::string school;
-    std::string phone;
+	std::string password;
+	std::string school;
+	std::string phone;
 };
 
+typedef std::chrono::steady_clock::time_point m_tpoint;
 std::map<std::string, User> users;
-std::map<std::string, long> has_login;  // 换成 std::chrono::seconds 之类的
+//std::map<std::string, long> has_login;  // 换成 std::chrono::seconds 之类的
+std::map<std::string, m_tpoint> has_login;  // 换成 std::chrono::seconds 之类的
 
+std::shared_mutex users_mtx;
+std::shared_mutex login_mtx;
 // 作业要求1：把这些函数变成多线程安全的
 // 提示：能正确利用 shared_mutex 加分，用 lock_guard 系列加分
-bool do_register(std::string username, std::string password, std::string school, std::string phone) {
-    User user = {password, school, phone};
-    if (users.emplace(username, user).second)
-        return "注册成功";
-    else
-        return "用户名已被注册";
+std::string do_register(std::string username, std::string password, std::string school, std::string phone) {
+	std::cout << "username: " << username << std::endl;
+	User user = {password, school, phone};
+	std::unique_lock<std::shared_mutex> lock(users_mtx);
+	users.emplace(username, user);
+	if (users.emplace(username, user).second)
+		return "resigter success";
+	else
+		return "registered";
+		//return "用户名已被注册";
 }
 
 std::string do_login(std::string username, std::string password) {
-    // 作业要求2：把这个登录计时器改成基于 chrono 的
-    long now = time(NULL);   // C 语言当前时间
-    if (has_login.find(username) != has_login.end()) {
-        int sec = now - has_login.at(username);  // C 语言算时间差
-        return std::to_string(sec) + "秒内登录过";
-    }
-    has_login[username] = now;
-
-    if (users.find(username) == users.end())
-        return "用户名错误";
-    if (users.at(username).password != password)
-        return "密码错误";
-    return "登录成功";
+	// 作业要求2：把这个登录计时器改成基于 chrono 的
+	// long now = time(NULL);   // C 语言当前时间
+	m_tpoint now = std::chrono::steady_clock::now();
+	{
+		std::shared_lock<std::shared_mutex> lock(login_mtx);
+
+		if (has_login.find(username) != has_login.end()) {
+			int sec = std::chrono::duration_cast<std::chrono::seconds>(now - has_login.at(username)).count();  // C 语言算时间差
+			return std::to_string(sec) + "  seconds ago logged";
+			//return std::to_string(sec) + "秒内登录过";
+		}
+		{
+
+			std::unique_lock<std::shared_mutex> lock(login_mtx);
+			has_login[username] = now;
+
+		}
+	}
+
+	std::shared_lock<std::shared_mutex> lock(users_mtx);
+	if (users.find(username) == users.end())
+	{
+		return "username was wrong";
+		//return "用户名错误";
+
+	}
+	if (users.at(username).password != password)
+	{
+		return "wrong password";
+
+	}
+	return "login success";
+	//return "登录成功";
 }
 
 std::string do_queryuser(std::string username) {
-    auto &user = users.at(username);
-    std::stringstream ss;
-    ss << "用户名: " << username << std::endl;
-    ss << "学校:" << user.school << std::endl;
-    ss << "电话: " << user.phone << std::endl;
-    return ss.str();
+	std::shared_lock<std::shared_mutex> lock(users_mtx);
+	std::cout << username << std::endl;
+	if (users.find(username) == users.end())
+		return "not found user";
+
+	auto &user = users.at(username);
+	std::stringstream ss;
+	ss << "用户名: " << username << std::endl;
+	ss << "学校:" << user.school << std::endl;
+	ss << "电话: " << user.phone << std::endl;
+	return ss.str();
 }
 
+constexpr unsigned int max_elements = 500;
+std::vector<std::thread> threads;
+
+//
+//std::vector<int> asdfa;
+//asdfa.reserve(100);
 
 struct ThreadPool {
-    void create(std::function<void()> start) {
-        // 作业要求3：如何让这个线程保持在后台执行不要退出？
-        // 提示：改成 async 和 future 且用法正确也可以加分
-        std::thread thr(start);
-    }
+	ThreadPool()
+	{
+		threads.reserve(max_elements);
+	}
+	void create(std::function<void()> start) {
+
+		// 作业要求3：如何让这个线程保持在后台执行不要退出？
+		// 提示：改成 async 和 future 且用法正确也可以加分
+		std::thread thr(start);
+		std::lock_guard<std::mutex> lck(m_mtx);
+		threads.push_back(std::move(thr));
+	}
+public:
+	std::mutex m_mtx;
+
 };
 
 ThreadPool tpool;
 
 
 namespace test {  // 测试用例？出水用力！
-std::string username[] = {"张心欣", "王鑫磊", "彭于斌", "胡原名"};
-std::string password[] = {"hellojob", "anti-job42", "cihou233", "reCihou_!"};
-std::string school[] = {"九百八十五大鞋", "浙江大鞋", "剑桥大鞋", "麻绳理工鞋院"};
-std::string phone[] = {"110", "119", "120", "12315"};
+	//std::string username[] = {"张心欣", "王鑫磊", "彭于斌", "胡原名"};
+	std::string username[] = {"zhangxinxi", "wangxinlei", "pengyubin", "huyuanming"};
+	std::string password[] = {"hellojob", "anti-job42", "cihou233", "reCihou_!"};
+	std::string school[] = {"985", "zhejiang", "jianqiao", "mashengligong"};
+	//std::string school[] = {"九百八十五大鞋", "浙江大鞋", "剑桥大鞋", "麻绳理工鞋院"};
+	std::string phone[] = {"110", "119", "120", "12315"};
 }
 
 int main() {
-    for (int i = 0; i < 262144; i++) {
-        tpool.create([&] {
-            std::cout << do_register(test::username[rand() % 4], test::password[rand() % 4], test::school[rand() % 4], test::phone[rand() % 4]) << std::endl;
-        });
-        tpool.create([&] {
-            std::cout << do_login(test::username[rand() % 4], test::password[rand() % 4]) << std::endl;
-        });
-        tpool.create([&] {
-            std::cout << do_queryuser(test::username[rand() % 4]) << std::endl;
-        });
-    }
-
-    // 作业要求4：等待 tpool 中所有线程都结束后再退出
-    return 0;
+	for (int i = 0; i < max_elements; i++) {
+	//for (int i = 0; i < 262144; i++) {
+		tpool.create([&] {
+			std::cout << do_register(test::username[rand() % 4], test::password[rand() % 4], test::school[rand() % 4], test::phone[rand() % 4]) << std::endl;
+		});
+		tpool.create([&] {
+			std::cout << do_login(test::username[rand() % 4], test::password[rand() % 4]) << std::endl;
+		});
+		tpool.create([&] {
+			std::cout << do_queryuser(test::username[rand() % 4]) << std::endl;
+		});
+	}
+
+	// 作业要求4：等待 tpool 中所有线程都结束后再退出
+	for (auto& t : threads) t.join();
+	return 0;
 }