From 66c5fdc564dd892ed265132d6c1378dbe3cebcee Mon Sep 17 00:00:00 2001 From: chai Date: Wed, 27 Mar 2019 09:07:54 +0800 Subject: *misc --- source/libs/asura-lib-utils/io/binding/_file.cpp | 6 +-- source/libs/asura-lib-utils/io/file.h | 3 ++ source/libs/asura-lib-utils/io/file_data.h | 2 +- source/libs/asura-lib-utils/io/io_task.cpp | 0 source/libs/asura-lib-utils/io/io_task.h | 39 ++++++++++++++ source/libs/asura-lib-utils/io/reloadable.h | 2 + .../libs/asura-lib-utils/threading/coroutine.cpp | 0 source/libs/asura-lib-utils/threading/coroutine.h | 31 +++++++++++ source/libs/asura-lib-utils/threading/mutex.cpp | 0 source/libs/asura-lib-utils/threading/mutex.h | 21 ++++++++ source/libs/asura-lib-utils/threading/thread.cpp | 14 +++++ source/libs/asura-lib-utils/threading/thread.h | 60 ++++++++++++++++++++++ .../threading/thread_impl_posix.cpp | 0 .../asura-lib-utils/threading/thread_impl_posix.h | 0 .../asura-lib-utils/threading/thread_impl_sdl.cpp | 0 .../asura-lib-utils/threading/thread_impl_sdl.h | 0 .../asura-lib-utils/threading/thread_impl_std.cpp | 0 .../asura-lib-utils/threading/thread_impl_std.h | 0 .../threading/thread_impl_win32.cpp | 0 .../asura-lib-utils/threading/thread_impl_win32.h | 35 +++++++++++++ .../libs/asura-lib-utils/threading/thread_task.cpp | 0 .../libs/asura-lib-utils/threading/thread_task.h | 27 ++++++++++ source/libs/asura-lib-utils/utils_config.h | 6 +++ source/libs/asura-lib-utils/utils_module.cpp | 3 ++ source/libs/asura-lib-utils/utils_module.h | 2 + 25 files changed, 247 insertions(+), 4 deletions(-) create mode 100644 source/libs/asura-lib-utils/io/io_task.cpp create mode 100644 source/libs/asura-lib-utils/io/io_task.h create mode 100644 source/libs/asura-lib-utils/threading/coroutine.cpp create mode 100644 source/libs/asura-lib-utils/threading/coroutine.h create mode 100644 source/libs/asura-lib-utils/threading/mutex.cpp create mode 100644 source/libs/asura-lib-utils/threading/mutex.h create mode 100644 source/libs/asura-lib-utils/threading/thread.cpp create mode 100644 source/libs/asura-lib-utils/threading/thread.h create mode 100644 source/libs/asura-lib-utils/threading/thread_impl_posix.cpp create mode 100644 source/libs/asura-lib-utils/threading/thread_impl_posix.h create mode 100644 source/libs/asura-lib-utils/threading/thread_impl_sdl.cpp create mode 100644 source/libs/asura-lib-utils/threading/thread_impl_sdl.h create mode 100644 source/libs/asura-lib-utils/threading/thread_impl_std.cpp create mode 100644 source/libs/asura-lib-utils/threading/thread_impl_std.h create mode 100644 source/libs/asura-lib-utils/threading/thread_impl_win32.cpp create mode 100644 source/libs/asura-lib-utils/threading/thread_impl_win32.h create mode 100644 source/libs/asura-lib-utils/threading/thread_task.cpp create mode 100644 source/libs/asura-lib-utils/threading/thread_task.h (limited to 'source/libs/asura-lib-utils') diff --git a/source/libs/asura-lib-utils/io/binding/_file.cpp b/source/libs/asura-lib-utils/io/binding/_file.cpp index 0baffd5..0670379 100644 --- a/source/libs/asura-lib-utils/io/binding/_file.cpp +++ b/source/libs/asura-lib-utils/io/binding/_file.cpp @@ -32,8 +32,8 @@ namespace AsuraEngine { LUAX_REGISTER_ENUM(state, "EFileMode", { "CLOSED", FILE_MODE_CLOSED }, - { "READ", FILE_MODE_READ }, - { "WRITE", FILE_MODE_WRITE }, + { "READ", FILE_MODE_READ }, + { "WRITE", FILE_MODE_WRITE }, { "APPEND", FILE_MODE_APPEND } ); @@ -130,7 +130,7 @@ namespace AsuraEngine return 1; } - // isWrite = file:Write(data buffer) + // isWrite = file:Write(data buffer[, size]) LUAX_IMPL_METHOD(File, _Write) { LUAX_PREPARE(L, File); diff --git a/source/libs/asura-lib-utils/io/file.h b/source/libs/asura-lib-utils/io/file.h index b09eaaa..4a6d38b 100644 --- a/source/libs/asura-lib-utils/io/file.h +++ b/source/libs/asura-lib-utils/io/file.h @@ -108,6 +108,9 @@ namespace AsuraEngine BufferMode mBufferMode; ///< 写入缓冲区模式 size_t mBufferSize; ///< 写入缓冲区大小 + LUAX_DECL_ENUM(FileMode); + LUAX_DECL_ENUM(BufferMode); + LUAX_DECL_METHOD(_New); LUAX_DECL_METHOD(_Open); LUAX_DECL_METHOD(_Close); diff --git a/source/libs/asura-lib-utils/io/file_data.h b/source/libs/asura-lib-utils/io/file_data.h index 106e068..9aa0e3b 100644 --- a/source/libs/asura-lib-utils/io/file_data.h +++ b/source/libs/asura-lib-utils/io/file_data.h @@ -56,10 +56,10 @@ namespace AsuraEngine std::string mExtension; ///< 不包含点的扩展名 std::string mName; ///< 不包含点和后缀的文件名 + LUAX_DECL_METHOD(_GetDataBuffer); LUAX_DECL_METHOD(_GetFileName); LUAX_DECL_METHOD(_GetExtension); LUAX_DECL_METHOD(_GetName); - LUAX_DECL_METHOD(_GetDataBuffer); }; diff --git a/source/libs/asura-lib-utils/io/io_task.cpp b/source/libs/asura-lib-utils/io/io_task.cpp new file mode 100644 index 0000000..e69de29 diff --git a/source/libs/asura-lib-utils/io/io_task.h b/source/libs/asura-lib-utils/io/io_task.h new file mode 100644 index 0000000..b91a88c --- /dev/null +++ b/source/libs/asura-lib-utils/io/io_task.h @@ -0,0 +1,39 @@ +#ifndef __ASURA_IO_TASK_H__ +#define __ASURA_IO_TASK_H__ + +#include + +#include "../scripting/portable.hpp" +#include "../threading/thread_task.h" + +#include "data_buffer.h" + +namespace AsuraEngine +{ + namespace IO + { + + /// + /// 读取文件任务。 + /// + class IOTask + : public AEScripting::Portable + , public AEThreading::ThreadTask + { + public: + + LUAX_DECL_FACTORY(IOTask); + + bool Execute() override ; + + private: + + std::string mPath; + DataBuffer* mDst; + + }; + + } +} + +#endif \ No newline at end of file diff --git a/source/libs/asura-lib-utils/io/reloadable.h b/source/libs/asura-lib-utils/io/reloadable.h index cf30296..22a721c 100644 --- a/source/libs/asura-lib-utils/io/reloadable.h +++ b/source/libs/asura-lib-utils/io/reloadable.h @@ -24,4 +24,6 @@ namespace AsuraEngine } } +namespace AEIO = AsuraEngine::IO; + #endif \ No newline at end of file diff --git a/source/libs/asura-lib-utils/threading/coroutine.cpp b/source/libs/asura-lib-utils/threading/coroutine.cpp new file mode 100644 index 0000000..e69de29 diff --git a/source/libs/asura-lib-utils/threading/coroutine.h b/source/libs/asura-lib-utils/threading/coroutine.h new file mode 100644 index 0000000..1ac6b21 --- /dev/null +++ b/source/libs/asura-lib-utils/threading/coroutine.h @@ -0,0 +1,31 @@ +#ifndef __ASURA_COROUTINE_H__ +#define __ASURA_COROUTINE_H__ + +#include + +namespace AsuraEngine +{ + namespace Threading + { + + /// + /// lua协程，用来做一些逻辑并发操作。 + /// + class Coroutine ASURA_FINAL + : public AEScripting::Portable + { + public: + + LUAX_DECL_FACTORY(Coroutine); + + private: + + LUAX_DECL_METHOD(_New); + LUAX_DECL_METHOD(_Run); + + }; + + } +} + +#endif \ No newline at end of file diff --git a/source/libs/asura-lib-utils/threading/mutex.cpp b/source/libs/asura-lib-utils/threading/mutex.cpp new file mode 100644 index 0000000..e69de29 diff --git a/source/libs/asura-lib-utils/threading/mutex.h b/source/libs/asura-lib-utils/threading/mutex.h new file mode 100644 index 0000000..893c6e5 --- /dev/null +++ b/source/libs/asura-lib-utils/threading/mutex.h @@ -0,0 +1,21 @@ +#ifndef __ASURA_MUTEX_H__ +#define __ASURA_MUTEX_H__ + +namespace AsuraEngine +{ + namespace Threading + { + + class Mutex + { + public: + + void Lock(); + void Unlock(); + + }; + + } +} + +#endif \ No newline at end of file diff --git a/source/libs/asura-lib-utils/threading/thread.cpp b/source/libs/asura-lib-utils/threading/thread.cpp new file mode 100644 index 0000000..c77f3ab --- /dev/null +++ b/source/libs/asura-lib-utils/threading/thread.cpp @@ -0,0 +1,14 @@ +#include "thread.h" + +namespace AsuraEngine +{ + namespace Threading + { + + bool Thread::Enqueue(ThreadTask* task) + { + + } + + } +} \ No newline at end of file diff --git a/source/libs/asura-lib-utils/threading/thread.h b/source/libs/asura-lib-utils/threading/thread.h new file mode 100644 index 0000000..0058144 --- /dev/null +++ b/source/libs/asura-lib-utils/threading/thread.h @@ -0,0 +1,60 @@ +#ifndef __ASURA_THREAD_H__ +#define __ASURA_THREAD_H__ + +#include +#include + +#include "thread_task.h" + +namespace AsuraEngine +{ + namespace Threading + { + + class ThreadImpl; + + /// + /// 线程主体，每个线程维护一个task queue。 + /// + class Thread ASURA_FINAL + : public AEScripting::Portable + { + public: + + LUAX_DECL_FACTORY(Thread); + + bool Enqueue(ThreadTask* task); + + void Run(); + + private: + + /// + /// 任务队列。 + /// + std::queue mTaskQueue; + + ThreadImpl* mImpl; + + LUAX_DECL_METHOD(_Enqueue); + LUAX_DECL_METHOD(_Run); + + }; + + /// + /// 线程的具体实现，对用户是透明的，一共准备了四种策略： + /// 1: win32 + /// 2: posix + /// 3: SDL + /// 4: std::thread + /// + ASURA_ABSTRACT class ThreadImpl + { + public: + + }; + + } +} + +#endif \ No newline at end of file diff --git a/source/libs/asura-lib-utils/threading/thread_impl_posix.cpp b/source/libs/asura-lib-utils/threading/thread_impl_posix.cpp new file mode 100644 index 0000000..e69de29 diff --git a/source/libs/asura-lib-utils/threading/thread_impl_posix.h b/source/libs/asura-lib-utils/threading/thread_impl_posix.h new file mode 100644 index 0000000..e69de29 diff --git a/source/libs/asura-lib-utils/threading/thread_impl_sdl.cpp b/source/libs/asura-lib-utils/threading/thread_impl_sdl.cpp new file mode 100644 index 0000000..e69de29 diff --git a/source/libs/asura-lib-utils/threading/thread_impl_sdl.h b/source/libs/asura-lib-utils/threading/thread_impl_sdl.h new file mode 100644 index 0000000..e69de29 diff --git a/source/libs/asura-lib-utils/threading/thread_impl_std.cpp b/source/libs/asura-lib-utils/threading/thread_impl_std.cpp new file mode 100644 index 0000000..e69de29 diff --git a/source/libs/asura-lib-utils/threading/thread_impl_std.h b/source/libs/asura-lib-utils/threading/thread_impl_std.h new file mode 100644 index 0000000..e69de29 diff --git a/source/libs/asura-lib-utils/threading/thread_impl_win32.cpp b/source/libs/asura-lib-utils/threading/thread_impl_win32.cpp new file mode 100644 index 0000000..e69de29 diff --git a/source/libs/asura-lib-utils/threading/thread_impl_win32.h b/source/libs/asura-lib-utils/threading/thread_impl_win32.h new file mode 100644 index 0000000..3dd2a8e --- /dev/null +++ b/source/libs/asura-lib-utils/threading/thread_impl_win32.h @@ -0,0 +1,35 @@ +#ifndef __ASURA_THREAD_WIN32_H__ +#define __ASURA_THREAD_WIN32_H__ + +#include "../utils_config.h" + +#if ASURA_THREAD_WIN32 + +#include +#include "thread.h" + +namespace AsuraEngine +{ + namespace Threading + { + + /// + /// Thread的win32实现。 + /// + class ThreadImplWin32 : public ThreadImpl + { + public: + + + private: + + HANDLE mHandle; + + }; + + } +} + +#endif // #if ASURA_THREAD_WIN32 + +#endif \ No newline at end of file diff --git a/source/libs/asura-lib-utils/threading/thread_task.cpp b/source/libs/asura-lib-utils/threading/thread_task.cpp new file mode 100644 index 0000000..e69de29 diff --git a/source/libs/asura-lib-utils/threading/thread_task.h b/source/libs/asura-lib-utils/threading/thread_task.h new file mode 100644 index 0000000..35e159c --- /dev/null +++ b/source/libs/asura-lib-utils/threading/thread_task.h @@ -0,0 +1,27 @@ +#ifndef __ASURA_THRAD_TASK_H__ +#define __ASURA_THRAD_TASK_H__ + +#include + +namespace AsuraEngine +{ + namespace Threading + { + + /// + /// 希望放在另一个线程处理的任务，继承Task并重写Execute方法。 + /// + ASURA_ABSTRACT class ThreadTask + { + public: + + virtual bool Execute() = 0; + + }; + + } +} + +namespace AEThreading = AsuraEngine::Threading; + +#endif \ No newline at end of file diff --git a/source/libs/asura-lib-utils/utils_config.h b/source/libs/asura-lib-utils/utils_config.h index e69de29..836eb07 100644 --- a/source/libs/asura-lib-utils/utils_config.h +++ b/source/libs/asura-lib-utils/utils_config.h @@ -0,0 +1,6 @@ +#ifndef __ASURA_UTILS_CONFIG_H__ +#define __ASURA_UTILS_CONFIG_H__ + +#define ASURA_THREAD_WIN32 1 + +#endif \ No newline at end of file diff --git a/source/libs/asura-lib-utils/utils_module.cpp b/source/libs/asura-lib-utils/utils_module.cpp index f335ec5..a0539ed 100644 --- a/source/libs/asura-lib-utils/utils_module.cpp +++ b/source/libs/asura-lib-utils/utils_module.cpp @@ -1,6 +1,7 @@ #include "utils_module.h" using namespace AsuraEngine::IO; +using namespace AsuraEngine::Threading; namespace AsuraEngine { @@ -12,6 +13,8 @@ namespace AsuraEngine LUAX_REGISTER_FACTORY(state, DataBuffer); LUAX_REGISTER_FACTORY(state, FileData); LUAX_REGISTER_FACTORY(state, File); + // Threading + LUAX_REGISTER_FACTORY(state, Thread); } void UtilsModule::Finalize(Luax::LuaxState& state) diff --git a/source/libs/asura-lib-utils/utils_module.h b/source/libs/asura-lib-utils/utils_module.h index bf80d27..ae875b9 100644 --- a/source/libs/asura-lib-utils/utils_module.h +++ b/source/libs/asura-lib-utils/utils_module.h @@ -6,6 +6,8 @@ #include "io/file_data.h" #include "io/file.h" +#include "threading/thread.h" + #include "module.h" namespace AsuraEngine -- cgit v1.1-26-g67d0