Skip to content

Commit 24b9985

Browse files
committed
refactor: use levilamina's threadpool
1 parent bb856fb commit 24b9985

File tree

5 files changed

+11
-95
lines changed

5 files changed

+11
-95
lines changed

src/legacy/ThreadPool.h

Lines changed: 0 additions & 84 deletions
This file was deleted.

src/legacy/api/FileSystemAPI.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ Local<Value> FileClass::read(const Arguments& args) {
254254
int cnt = args[0].toInt();
255255
script::Global<Function> callbackFunc{args[1].asFunction()};
256256

257-
pool.enqueue(
257+
pool.addTask(
258258
[cnt,
259259
fp{&file},
260260
isBinary{isBinary},
@@ -293,7 +293,7 @@ Local<Value> FileClass::readLine(const Arguments& args) {
293293
try {
294294
script::Global<Function> callbackFunc{args[0].asFunction()};
295295

296-
pool.enqueue([fp{&file}, lock{&lock}, callback{std::move(callbackFunc)}, engine{EngineScope::currentEngine()}](
296+
pool.addTask([fp{&file}, lock{&lock}, callback{std::move(callbackFunc)}, engine{EngineScope::currentEngine()}](
297297
) {
298298
if ((ll::getServerStatus() != ll::ServerStatus::Running)) return;
299299
if (!EngineManager::isValid(engine)) return;
@@ -321,7 +321,7 @@ Local<Value> FileClass::readAll(const Arguments& args) {
321321
try {
322322
script::Global<Function> callbackFunc{args[0].asFunction()};
323323

324-
pool.enqueue([fp{&file},
324+
pool.addTask([fp{&file},
325325
isBinary{isBinary},
326326
lock{&lock},
327327
callback{std::move(callbackFunc)},
@@ -366,7 +366,7 @@ Local<Value> FileClass::write(const Arguments& args) {
366366
script::Global<Function> callbackFunc;
367367
if (args.size() >= 2) callbackFunc = args[1].asFunction();
368368

369-
pool.enqueue([fp{&file},
369+
pool.addTask([fp{&file},
370370
lock{&lock},
371371
data{std::move(data)},
372372
isString,
@@ -405,7 +405,7 @@ Local<Value> FileClass::writeLine(const Arguments& args) {
405405
script::Global<Function> callbackFunc;
406406
if (args.size() >= 2) callbackFunc = args[1].asFunction();
407407

408-
pool.enqueue([fp{&file},
408+
pool.addTask([fp{&file},
409409
lock{&lock},
410410
data{std::move(data)},
411411
callback{std::move(callbackFunc)},
@@ -487,7 +487,7 @@ Local<Value> FileClass::isEOF(const Arguments& args) {
487487

488488
Local<Value> FileClass::flush(const Arguments& args) {
489489
try {
490-
pool.enqueue([fp{&file}, lock{&lock}]() {
490+
pool.addTask([fp{&file}, lock{&lock}]() {
491491
lock->lock();
492492
fp->flush();
493493
lock->unlock();

src/legacy/api/ScriptAPI.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ Local<Value> FastLog(const Arguments& args) {
103103
std::ostringstream sout;
104104
for (int i = 0; i < args.size(); ++i) PrintValue(sout, args[i]);
105105

106-
pool.enqueue([str{sout.str()}, pluginName{ENGINE_OWN_DATA()->pluginName}]() {
106+
pool.addTask([str{sout.str()}, pluginName{ENGINE_OWN_DATA()->pluginName}]() {
107107
ll::Logger fastLogger(pluginName);
108108
fastLogger.info(str);
109109
});

src/legacy/engine/LocalShareData.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include "engine/LocalShareData.h"
22

3-
#include "ThreadPool.h"
43
#include "main/Configs.h"
54

5+
#include <ll/api/thread/ThreadPool.h>
66
#include <mutex>
77

88
// DLL本地共享数据
@@ -12,7 +12,7 @@ LocalDataType* localShareData;
1212
std::vector<RegCmdQueue> toRegCmdQueue;
1313

1414
// 线程池
15-
ThreadPool pool(LLSE_POOL_THREAD_COUNT);
15+
ll::thread::ThreadPool pool(LLSE_POOL_THREAD_COUNT);
1616

1717
std::mutex messageLoopLock;
1818

src/legacy/engine/LocalShareData.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
2-
#include "ThreadPool.h"
32
#include "api/APIHelp.h"
43

4+
#include <ll/api/thread/ThreadPool.h>
55
#include <map>
66
#include <mutex>
77
#include <string>
@@ -54,7 +54,7 @@ extern LocalDataType* localShareData;
5454
extern std::vector<RegCmdQueue> toRegCmdQueue;
5555

5656
// 线程池
57-
extern ThreadPool pool;
57+
extern ll::thread::ThreadPool pool;
5858

5959
extern std::mutex messageLoopLock;
6060

0 commit comments

Comments
 (0)