Skip to content

Commit

Permalink
update bee
Browse files Browse the repository at this point in the history
  • Loading branch information
@actboy168
actboy168 committed Apr 22, 2024
1 parent 860fc30 commit 1294cc4
Show file tree
Hide file tree
Showing 9 changed files with 197 additions and 129 deletions.
2 changes: 1 addition & 1 deletion bee.lua
Submodule bee.lua updated 22 files
+1 −1 bee/lua/narrow.h
+65 −0 bee/net/bpoll.h
+1 −0 bee/net/bpoll_bsd.cpp
+48 −0 bee/net/bpoll_linux.cpp
+222 −0 bee/net/bpoll_osx.cpp
+93 −0 bee/net/bpoll_win.cpp
+2 −6 bee/net/socket.h
+44 −0 bee/utility/bitmask.h
+468 −0 bee/utility/flatmap.h
+39 −0 bee/utility/hybrid_array.h
+214 −0 bee/win/afd/afd.cpp
+53 −0 bee/win/afd/afd.h
+160 −0 bee/win/afd/poller.cpp
+28 −0 bee/win/afd/poller.h
+133 −0 bee/win/afd/poller_fd.cpp
+42 −0 bee/win/afd/poller_fd.h
+247 −0 binding/lua_epoll.cpp
+83 −0 binding/luaref.cpp
+11 −0 binding/luaref.h
+1 −0 compile/common.lua
+1 −0 test/test.lua
+470 −0 test/test_epoll.lua
37 changes: 22 additions & 15 deletions compile/ninja/android.ninja
View file
Expand Up @@ -29,6 +29,8 @@ rule cxx_source_bee_1
build $obj/source_bee/error.obj: cxx_source_bee_1 bee.lua/bee/error.cpp
build $obj/source_bee/filewatch_linux.obj: cxx_source_bee_1 $
bee.lua/bee/filewatch/filewatch_linux.cpp
build $obj/source_bee/bpoll_linux.obj: cxx_source_bee_1 $
bee.lua/bee/net/bpoll_linux.cpp
build $obj/source_bee/endpoint.obj: cxx_source_bee_1 $
bee.lua/bee/net/endpoint.cpp
build $obj/source_bee/socket.obj: cxx_source_bee_1 bee.lua/bee/net/socket.cpp
Expand Down Expand Up @@ -62,6 +64,8 @@ rule cxx_source_bee_2
depfile = $out.d
build $obj/source_bee/lua_debugging.obj: cxx_source_bee_2 $
bee.lua/binding/lua_debugging.cpp
build $obj/source_bee/lua_epoll.obj: cxx_source_bee_2 $
bee.lua/binding/lua_epoll.cpp
build $obj/source_bee/lua_filesystem.obj: cxx_source_bee_2 $
bee.lua/binding/lua_filesystem.cpp
build $obj/source_bee/lua_filewatch.obj: cxx_source_bee_2 $
Expand All @@ -80,6 +84,7 @@ build $obj/source_bee/lua_thread.obj: cxx_source_bee_2 $
bee.lua/binding/lua_thread.cpp
build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
bee.lua/binding/lua_time.cpp
build $obj/source_bee/luaref.obj: cxx_source_bee_2 bee.lua/binding/luaref.cpp
rule c_source_lua
command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -DMAKE_LIB $
-DLUA_USE_LINUX -DNDEBUG -o $out -c $in
Expand Down Expand Up @@ -111,29 +116,31 @@ rule test
build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
$obj/source_bee/lua-seri.obj $obj/source_bee/format.obj $
$obj/source_bee/error.obj $obj/source_bee/filewatch_linux.obj $
$obj/source_bee/endpoint.obj $obj/source_bee/socket.obj $
$obj/source_bee/process_select.obj $obj/source_bee/subprocess_posix.obj $
$obj/source_bee/atomic_sync.obj $obj/source_bee/setname.obj $
$obj/source_bee/simplethread_posix.obj $obj/source_bee/spinlock.obj $
$obj/source_bee/file_handle.obj $obj/source_bee/file_handle_linux.obj $
$obj/source_bee/bpoll_linux.obj $obj/source_bee/endpoint.obj $
$obj/source_bee/socket.obj $obj/source_bee/process_select.obj $
$obj/source_bee/subprocess_posix.obj $obj/source_bee/atomic_sync.obj $
$obj/source_bee/setname.obj $obj/source_bee/simplethread_posix.obj $
$obj/source_bee/spinlock.obj $obj/source_bee/file_handle.obj $
$obj/source_bee/file_handle_linux.obj $
$obj/source_bee/file_handle_posix.obj $obj/source_bee/path_helper.obj $
$obj/source_bee/version.obj $obj/source_bee/lua_debugging.obj $
$obj/source_bee/lua_filesystem.obj $obj/source_bee/lua_filewatch.obj $
$obj/source_bee/lua_platform.obj $obj/source_bee/lua_select.obj $
$obj/source_bee/lua_serialization.obj $obj/source_bee/lua_socket.obj $
$obj/source_bee/lua_subprocess.obj $obj/source_bee/lua_thread.obj $
$obj/source_bee/lua_time.obj $obj/source_lua/linit.obj $
$obj/source_bee/lua_epoll.obj $obj/source_bee/lua_filesystem.obj $
$obj/source_bee/lua_filewatch.obj $obj/source_bee/lua_platform.obj $
$obj/source_bee/lua_select.obj $obj/source_bee/lua_serialization.obj $
$obj/source_bee/lua_socket.obj $obj/source_bee/lua_subprocess.obj $
$obj/source_bee/lua_thread.obj $obj/source_bee/lua_time.obj $
$obj/source_bee/luaref.obj $obj/source_lua/linit.obj $
$obj/source_lua/onelua.obj
build $bin/main.lua: copy | $bin/bootstrap
input = bee.lua/bootstrap/main.lua
build $obj/test.stamp: test bee.lua/test/glibc-version.lua $
bee.lua/test/ltest.lua bee.lua/test/shell.lua $
bee.lua/test/supported.lua bee.lua/test/test.lua $
bee.lua/test/test_filesystem.lua bee.lua/test/test_filewatch.lua $
bee.lua/test/test_lua.lua bee.lua/test/test_serialization.lua $
bee.lua/test/test_socket.lua bee.lua/test/test_subprocess.lua $
bee.lua/test/test_thread.lua bee.lua/test/test_time.lua | $
$bin/bootstrap copy_script
bee.lua/test/test_epoll.lua bee.lua/test/test_filesystem.lua $
bee.lua/test/test_filewatch.lua bee.lua/test/test_lua.lua $
bee.lua/test/test_serialization.lua bee.lua/test/test_socket.lua $
bee.lua/test/test_subprocess.lua bee.lua/test/test_thread.lua $
bee.lua/test/test_time.lua | $bin/bootstrap copy_script
build luamake: copy | $bin/bootstrap
input = $bin/bootstrap
build bootstrap: phony $bin/bootstrap
Expand Down
37 changes: 22 additions & 15 deletions compile/ninja/freebsd.ninja
View file
Expand Up @@ -30,6 +30,8 @@ rule cxx_source_bee_1
build $obj/source_bee/error.obj: cxx_source_bee_1 bee.lua/bee/error.cpp
build $obj/source_bee/filewatch_bsd.obj: cxx_source_bee_1 $
bee.lua/bee/filewatch/filewatch_bsd.cpp
build $obj/source_bee/bpoll_bsd.obj: cxx_source_bee_1 $
bee.lua/bee/net/bpoll_bsd.cpp
build $obj/source_bee/endpoint.obj: cxx_source_bee_1 $
bee.lua/bee/net/endpoint.cpp
build $obj/source_bee/socket.obj: cxx_source_bee_1 bee.lua/bee/net/socket.cpp
Expand Down Expand Up @@ -63,6 +65,8 @@ rule cxx_source_bee_2
depfile = $out.d
build $obj/source_bee/lua_debugging.obj: cxx_source_bee_2 $
bee.lua/binding/lua_debugging.cpp
build $obj/source_bee/lua_epoll.obj: cxx_source_bee_2 $
bee.lua/binding/lua_epoll.cpp
build $obj/source_bee/lua_filesystem.obj: cxx_source_bee_2 $
bee.lua/binding/lua_filesystem.cpp
build $obj/source_bee/lua_filewatch.obj: cxx_source_bee_2 $
Expand All @@ -81,6 +85,7 @@ build $obj/source_bee/lua_thread.obj: cxx_source_bee_2 $
bee.lua/binding/lua_thread.cpp
build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
bee.lua/binding/lua_time.cpp
build $obj/source_bee/luaref.obj: cxx_source_bee_2 bee.lua/binding/luaref.cpp
rule c_source_lua
command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -DMAKE_LIB $
-DLUA_USE_LINUX -DNDEBUG -o $out -c $in
Expand Down Expand Up @@ -113,29 +118,31 @@ rule test
build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
$obj/source_bee/lua-seri.obj $obj/source_bee/format.obj $
$obj/source_bee/error.obj $obj/source_bee/filewatch_bsd.obj $
$obj/source_bee/endpoint.obj $obj/source_bee/socket.obj $
$obj/source_bee/process_select.obj $obj/source_bee/subprocess_posix.obj $
$obj/source_bee/atomic_sync.obj $obj/source_bee/setname.obj $
$obj/source_bee/simplethread_posix.obj $obj/source_bee/spinlock.obj $
$obj/source_bee/file_handle.obj $obj/source_bee/file_handle_bsd.obj $
$obj/source_bee/bpoll_bsd.obj $obj/source_bee/endpoint.obj $
$obj/source_bee/socket.obj $obj/source_bee/process_select.obj $
$obj/source_bee/subprocess_posix.obj $obj/source_bee/atomic_sync.obj $
$obj/source_bee/setname.obj $obj/source_bee/simplethread_posix.obj $
$obj/source_bee/spinlock.obj $obj/source_bee/file_handle.obj $
$obj/source_bee/file_handle_bsd.obj $
$obj/source_bee/file_handle_posix.obj $obj/source_bee/path_helper.obj $
$obj/source_bee/version.obj $obj/source_bee/lua_debugging.obj $
$obj/source_bee/lua_filesystem.obj $obj/source_bee/lua_filewatch.obj $
$obj/source_bee/lua_platform.obj $obj/source_bee/lua_select.obj $
$obj/source_bee/lua_serialization.obj $obj/source_bee/lua_socket.obj $
$obj/source_bee/lua_subprocess.obj $obj/source_bee/lua_thread.obj $
$obj/source_bee/lua_time.obj $obj/source_lua/linit.obj $
$obj/source_bee/lua_epoll.obj $obj/source_bee/lua_filesystem.obj $
$obj/source_bee/lua_filewatch.obj $obj/source_bee/lua_platform.obj $
$obj/source_bee/lua_select.obj $obj/source_bee/lua_serialization.obj $
$obj/source_bee/lua_socket.obj $obj/source_bee/lua_subprocess.obj $
$obj/source_bee/lua_thread.obj $obj/source_bee/lua_time.obj $
$obj/source_bee/luaref.obj $obj/source_lua/linit.obj $
$obj/source_lua/onelua.obj
build $bin/main.lua: copy | $bin/bootstrap
input = bee.lua/bootstrap/main.lua
build $obj/test.stamp: test bee.lua/test/glibc-version.lua $
bee.lua/test/ltest.lua bee.lua/test/shell.lua $
bee.lua/test/supported.lua bee.lua/test/test.lua $
bee.lua/test/test_filesystem.lua bee.lua/test/test_filewatch.lua $
bee.lua/test/test_lua.lua bee.lua/test/test_serialization.lua $
bee.lua/test/test_socket.lua bee.lua/test/test_subprocess.lua $
bee.lua/test/test_thread.lua bee.lua/test/test_time.lua | $
$bin/bootstrap copy_script
bee.lua/test/test_epoll.lua bee.lua/test/test_filesystem.lua $
bee.lua/test/test_filewatch.lua bee.lua/test/test_lua.lua $
bee.lua/test/test_serialization.lua bee.lua/test/test_socket.lua $
bee.lua/test/test_subprocess.lua bee.lua/test/test_thread.lua $
bee.lua/test/test_time.lua | $bin/bootstrap copy_script
build luamake: copy | $bin/bootstrap
input = $bin/bootstrap
build bootstrap: phony $bin/bootstrap
Expand Down
37 changes: 22 additions & 15 deletions compile/ninja/linux.ninja
View file
Expand Up @@ -29,6 +29,8 @@ rule cxx_source_bee_1
build $obj/source_bee/error.obj: cxx_source_bee_1 bee.lua/bee/error.cpp
build $obj/source_bee/filewatch_linux.obj: cxx_source_bee_1 $
bee.lua/bee/filewatch/filewatch_linux.cpp
build $obj/source_bee/bpoll_linux.obj: cxx_source_bee_1 $
bee.lua/bee/net/bpoll_linux.cpp
build $obj/source_bee/endpoint.obj: cxx_source_bee_1 $
bee.lua/bee/net/endpoint.cpp
build $obj/source_bee/socket.obj: cxx_source_bee_1 bee.lua/bee/net/socket.cpp
Expand Down Expand Up @@ -62,6 +64,8 @@ rule cxx_source_bee_2
depfile = $out.d
build $obj/source_bee/lua_debugging.obj: cxx_source_bee_2 $
bee.lua/binding/lua_debugging.cpp
build $obj/source_bee/lua_epoll.obj: cxx_source_bee_2 $
bee.lua/binding/lua_epoll.cpp
build $obj/source_bee/lua_filesystem.obj: cxx_source_bee_2 $
bee.lua/binding/lua_filesystem.cpp
build $obj/source_bee/lua_filewatch.obj: cxx_source_bee_2 $
Expand All @@ -80,6 +84,7 @@ build $obj/source_bee/lua_thread.obj: cxx_source_bee_2 $
bee.lua/binding/lua_thread.cpp
build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
bee.lua/binding/lua_time.cpp
build $obj/source_bee/luaref.obj: cxx_source_bee_2 bee.lua/binding/luaref.cpp
rule c_source_lua
command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall -DMAKE_LIB $
-DLUA_USE_LINUX -DNDEBUG -fPIC -Wno-maybe-uninitialized -o $out -c $in
Expand Down Expand Up @@ -112,29 +117,31 @@ rule test
build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
$obj/source_bee/lua-seri.obj $obj/source_bee/format.obj $
$obj/source_bee/error.obj $obj/source_bee/filewatch_linux.obj $
$obj/source_bee/endpoint.obj $obj/source_bee/socket.obj $
$obj/source_bee/process_select.obj $obj/source_bee/subprocess_posix.obj $
$obj/source_bee/atomic_sync.obj $obj/source_bee/setname.obj $
$obj/source_bee/simplethread_posix.obj $obj/source_bee/spinlock.obj $
$obj/source_bee/file_handle.obj $obj/source_bee/file_handle_linux.obj $
$obj/source_bee/bpoll_linux.obj $obj/source_bee/endpoint.obj $
$obj/source_bee/socket.obj $obj/source_bee/process_select.obj $
$obj/source_bee/subprocess_posix.obj $obj/source_bee/atomic_sync.obj $
$obj/source_bee/setname.obj $obj/source_bee/simplethread_posix.obj $
$obj/source_bee/spinlock.obj $obj/source_bee/file_handle.obj $
$obj/source_bee/file_handle_linux.obj $
$obj/source_bee/file_handle_posix.obj $obj/source_bee/path_helper.obj $
$obj/source_bee/version.obj $obj/source_bee/lua_debugging.obj $
$obj/source_bee/lua_filesystem.obj $obj/source_bee/lua_filewatch.obj $
$obj/source_bee/lua_platform.obj $obj/source_bee/lua_select.obj $
$obj/source_bee/lua_serialization.obj $obj/source_bee/lua_socket.obj $
$obj/source_bee/lua_subprocess.obj $obj/source_bee/lua_thread.obj $
$obj/source_bee/lua_time.obj $obj/source_lua/linit.obj $
$obj/source_bee/lua_epoll.obj $obj/source_bee/lua_filesystem.obj $
$obj/source_bee/lua_filewatch.obj $obj/source_bee/lua_platform.obj $
$obj/source_bee/lua_select.obj $obj/source_bee/lua_serialization.obj $
$obj/source_bee/lua_socket.obj $obj/source_bee/lua_subprocess.obj $
$obj/source_bee/lua_thread.obj $obj/source_bee/lua_time.obj $
$obj/source_bee/luaref.obj $obj/source_lua/linit.obj $
$obj/source_lua/onelua.obj
build $bin/main.lua: copy | $bin/bootstrap
input = bee.lua/bootstrap/main.lua
build $obj/test.stamp: test bee.lua/test/glibc-version.lua $
bee.lua/test/ltest.lua bee.lua/test/shell.lua $
bee.lua/test/supported.lua bee.lua/test/test.lua $
bee.lua/test/test_filesystem.lua bee.lua/test/test_filewatch.lua $
bee.lua/test/test_lua.lua bee.lua/test/test_serialization.lua $
bee.lua/test/test_socket.lua bee.lua/test/test_subprocess.lua $
bee.lua/test/test_thread.lua bee.lua/test/test_time.lua | $
$bin/bootstrap copy_script
bee.lua/test/test_epoll.lua bee.lua/test/test_filesystem.lua $
bee.lua/test/test_filewatch.lua bee.lua/test/test_lua.lua $
bee.lua/test/test_serialization.lua bee.lua/test/test_socket.lua $
bee.lua/test/test_subprocess.lua bee.lua/test/test_thread.lua $
bee.lua/test/test_time.lua | $bin/bootstrap copy_script
build luamake: copy | $bin/bootstrap
input = $bin/bootstrap
build bootstrap: phony $bin/bootstrap
Expand Down
37 changes: 22 additions & 15 deletions compile/ninja/macos.ninja
View file
Expand Up @@ -32,6 +32,8 @@ rule cxx_source_bee_1
build $obj/source_bee/error.obj: cxx_source_bee_1 bee.lua/bee/error.cpp
build $obj/source_bee/filewatch_osx.obj: cxx_source_bee_1 $
bee.lua/bee/filewatch/filewatch_osx.cpp
build $obj/source_bee/bpoll_osx.obj: cxx_source_bee_1 $
bee.lua/bee/net/bpoll_osx.cpp
build $obj/source_bee/endpoint.obj: cxx_source_bee_1 $
bee.lua/bee/net/endpoint.cpp
build $obj/source_bee/socket.obj: cxx_source_bee_1 bee.lua/bee/net/socket.cpp
Expand Down Expand Up @@ -65,6 +67,8 @@ rule cxx_source_bee_2
depfile = $out.d
build $obj/source_bee/lua_debugging.obj: cxx_source_bee_2 $
bee.lua/binding/lua_debugging.cpp
build $obj/source_bee/lua_epoll.obj: cxx_source_bee_2 $
bee.lua/binding/lua_epoll.cpp
build $obj/source_bee/lua_filesystem.obj: cxx_source_bee_2 $
bee.lua/binding/lua_filesystem.cpp
build $obj/source_bee/lua_filewatch.obj: cxx_source_bee_2 $
Expand All @@ -83,6 +87,7 @@ build $obj/source_bee/lua_thread.obj: cxx_source_bee_2 $
bee.lua/binding/lua_thread.cpp
build $obj/source_bee/lua_time.obj: cxx_source_bee_2 $
bee.lua/binding/lua_time.cpp
build $obj/source_bee/luaref.obj: cxx_source_bee_2 bee.lua/binding/luaref.cpp
rule c_source_lua
command = $cc -MMD -MT $out -MF $out.d -std=c11 -O2 -Wall $
-mmacosx-version-min=10.15 -DMAKE_LIB -DLUA_USE_MACOSX -DNDEBUG $
Expand Down Expand Up @@ -117,29 +122,31 @@ rule test
build $bin/bootstrap: link_bootstrap $obj/source_bootstrap/main.obj $
$obj/source_bee/lua-seri.obj $obj/source_bee/format.obj $
$obj/source_bee/error.obj $obj/source_bee/filewatch_osx.obj $
$obj/source_bee/endpoint.obj $obj/source_bee/socket.obj $
$obj/source_bee/process_select.obj $obj/source_bee/subprocess_posix.obj $
$obj/source_bee/atomic_sync.obj $obj/source_bee/setname.obj $
$obj/source_bee/simplethread_posix.obj $obj/source_bee/spinlock.obj $
$obj/source_bee/file_handle.obj $obj/source_bee/file_handle_osx.obj $
$obj/source_bee/bpoll_osx.obj $obj/source_bee/endpoint.obj $
$obj/source_bee/socket.obj $obj/source_bee/process_select.obj $
$obj/source_bee/subprocess_posix.obj $obj/source_bee/atomic_sync.obj $
$obj/source_bee/setname.obj $obj/source_bee/simplethread_posix.obj $
$obj/source_bee/spinlock.obj $obj/source_bee/file_handle.obj $
$obj/source_bee/file_handle_osx.obj $
$obj/source_bee/file_handle_posix.obj $obj/source_bee/path_helper.obj $
$obj/source_bee/version.obj $obj/source_bee/lua_debugging.obj $
$obj/source_bee/lua_filesystem.obj $obj/source_bee/lua_filewatch.obj $
$obj/source_bee/lua_platform.obj $obj/source_bee/lua_select.obj $
$obj/source_bee/lua_serialization.obj $obj/source_bee/lua_socket.obj $
$obj/source_bee/lua_subprocess.obj $obj/source_bee/lua_thread.obj $
$obj/source_bee/lua_time.obj $obj/source_lua/linit.obj $
$obj/source_bee/lua_epoll.obj $obj/source_bee/lua_filesystem.obj $
$obj/source_bee/lua_filewatch.obj $obj/source_bee/lua_platform.obj $
$obj/source_bee/lua_select.obj $obj/source_bee/lua_serialization.obj $
$obj/source_bee/lua_socket.obj $obj/source_bee/lua_subprocess.obj $
$obj/source_bee/lua_thread.obj $obj/source_bee/lua_time.obj $
$obj/source_bee/luaref.obj $obj/source_lua/linit.obj $
$obj/source_lua/onelua.obj
build $bin/main.lua: copy | $bin/bootstrap
input = bee.lua/bootstrap/main.lua
build $obj/test.stamp: test bee.lua/test/glibc-version.lua $
bee.lua/test/ltest.lua bee.lua/test/shell.lua $
bee.lua/test/supported.lua bee.lua/test/test.lua $
bee.lua/test/test_filesystem.lua bee.lua/test/test_filewatch.lua $
bee.lua/test/test_lua.lua bee.lua/test/test_serialization.lua $
bee.lua/test/test_socket.lua bee.lua/test/test_subprocess.lua $
bee.lua/test/test_thread.lua bee.lua/test/test_time.lua | $
$bin/bootstrap copy_script
bee.lua/test/test_epoll.lua bee.lua/test/test_filesystem.lua $
bee.lua/test/test_filewatch.lua bee.lua/test/test_lua.lua $
bee.lua/test/test_serialization.lua bee.lua/test/test_socket.lua $
bee.lua/test/test_subprocess.lua bee.lua/test/test_thread.lua $
bee.lua/test/test_time.lua | $bin/bootstrap copy_script
build luamake: copy | $bin/bootstrap
input = $bin/bootstrap
build bootstrap: phony $bin/bootstrap
Expand Down

0 comments on commit 1294cc4

Please sign in to comment.