1585346868/fastweb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
xx
2024-06-07 19:44:35 +08:00
parent f3540cd415
commit 8fb96b705d
7 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/global.cpp
View File

@@ -15,7 +15,7 @@ void fastweb::global::regist(sol::state* lua)
for_iter(iter, (*m_ptrs.parent()))
{
auto im = static_cast<module::base*>(iter->second);
im->regist_global(iter->first, lua);
im->regist_global(iter->first.c_str(), lua);
}
m_ptrs.unlock();
}

30
src/core/subscribemanager.cpp
View File

@@ -83,18 +83,34 @@ void fastweb::subscribe_manager::exec(const std::string& filepath, network::http
std::string exception_string;
try
{
auto lbResult = lua->state->load_file(filepath);
if (lbResult.valid() == false)
{
sol::error err = lbResult;
throw ylib::exception("Failed to load script, " + std::string(err.what()));
//auto lbResult = lua->state->load_file(filepath);
//if (lbResult.valid() == false)
//{
// sol::error err = lbResult;
// throw ylib::exception("Failed to load script, " + std::string(err.what()));
//}
//module::request m_request(request);
//module::response m_response(response);
//(*lua->state)["response"] = &m_response;
//(*lua->state)["request"] = &m_request;
//lbResult();
sol::load_result script = lua->state->load_file(filepath);
if (!script.valid()) {
sol::error err = script;
throw ylib::exception(err.what());
}
module::request m_request(request);
module::response m_response(response);
(*lua->state)["response"] = &m_response;
(*lua->state)["request"] = &m_request;
lbResult();
sol::protected_function_result result = script();
if (!result.valid()) {
sol::error err = result;
throw ylib::exception(err.what());
}
}
catch (const std::exception& e)
{

2
src/module/basemodule.h
View File

@@ -14,7 +14,7 @@ namespace module
/// </summary>
/// <param name="name"></param>
/// <param name="lua"></param>
virtual void regist_global(const std::string& name,sol::state* lua) = 0;
virtual void regist_global(const char* name, sol::state* lua) = 0;
/// <summary>
/// 释放全局变量(global类管理)
/// </summary>

2
src/module/mutex.cpp
View File

@@ -34,7 +34,7 @@ void module::mutex::regist(sol::state* lua)
);
}
void module::mutex::regist_global(const std::string& name, sol::state* lua)
void module::mutex::regist_global(const char* name, sol::state* lua)
{
lua->registry()[name] = this;
(*lua)[name] = this;

2
src/module/mutex.h
View File

@@ -27,7 +27,7 @@ namespace module
static void regist(sol::state* lua);
private:
// 通过 imodule 继承
virtual void regist_global(const std::string& name, sol::state* lua);
virtual void regist_global(const char* name, sol::state* lua);
virtual void delete_global() { delete this; }
std::mutex m_mutex;
};

2
src/module/timer.cpp
View File

@@ -66,7 +66,7 @@ void module::timer::regist(sol::state* lua)
);
}
void module::timer::regist_global(const std::string& name, sol::state* lua)
void module::timer::regist_global(const char* name, sol::state* lua)
{
lua->registry()[name] = this;
(*lua)[name] = this;

2
src/module/timer.h
View File

@@ -41,7 +41,7 @@ namespace module
/// <param name="name"></param>
void remove(const std::string& name, sol::this_state ts);
static void regist(sol::state* lua);
virtual void regist_global(const std::string& name, sol::state* lua) override;
virtual void regist_global(const char* name, sol::state* lua) override;
virtual void delete_global() { delete this; }
private: