From 2a38f94211ba6e345ff69cfc9bed1cfe66b6348d Mon Sep 17 00:00:00 2001 From: wrp Date: Wed, 5 Jul 2023 11:35:45 +0800 Subject: [PATCH 1/5] add --- .gitignore | 2 +- .../unity/beaver/native/local_beaver.c | 1 + .../unity/collector/observe/observe_mem.lua | 5 +++ .../unity/collector/observe/observe_sche.lua | 43 +++++++++++++++++++ 4 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 source/tools/monitor/unity/collector/observe/observe_mem.lua create mode 100644 source/tools/monitor/unity/collector/observe/observe_sche.lua diff --git a/.gitignore b/.gitignore index cab19059..40a844cf 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ *.o.cmd *.ko *.ko.cmd - +*.idea Module.symvers modules.builtin modules.order diff --git a/source/tools/monitor/unity/beaver/native/local_beaver.c b/source/tools/monitor/unity/beaver/native/local_beaver.c index 8e83a8b5..63490781 100644 --- a/source/tools/monitor/unity/beaver/native/local_beaver.c +++ b/source/tools/monitor/unity/beaver/native/local_beaver.c @@ -4,6 +4,7 @@ #include "local_beaver.h" #include +#include #include #include #include diff --git a/source/tools/monitor/unity/collector/observe/observe_mem.lua b/source/tools/monitor/unity/collector/observe/observe_mem.lua new file mode 100644 index 00000000..85f7cc5b --- /dev/null +++ b/source/tools/monitor/unity/collector/observe/observe_mem.lua @@ -0,0 +1,5 @@ +--- +--- Generated by EmmyLua(https://github.com/EmmyLua) +--- Created by wrp. +--- DateTime: 2023/7/4 19:39 +--- \ No newline at end of file diff --git a/source/tools/monitor/unity/collector/observe/observe_sche.lua b/source/tools/monitor/unity/collector/observe/observe_sche.lua new file mode 100644 index 00000000..4ee7d405 --- /dev/null +++ b/source/tools/monitor/unity/collector/observe/observe_sche.lua @@ -0,0 +1,43 @@ +--- +--- Generated by EmmyLua(https://github.com/EmmyLua) +--- Created by wrp. +--- DateTime: 2023/7/4 19:37 +--- + +require("common.class") +local unistd = require("posix.unistd") +local CvProto = require("collector.vproto") +local CobserveSche = class("observeSche",CvProto) + +local pid = 1 + +function CobserveSche:_init_(proto, pffi, mnt, pFile) + CvProto._init_(self, proto) + self.pFile = mnt .. pFile + self._fsche = "/proc/" .. pid .. "/schedstat" +end + +function CprocStatm:proc(elapsed, lines) + + local heads = {"size", "resident", "shared", "text", "lib", "data", "dt"} + local c = 0 + for line in io.lines(self._fstatm) do + local vs = {} + local data = self._ffi.new("var_long_t") + assert(self._cffi.var_input_long(self._ffi.string(line), data) == 0) + assert(data.no == 7) + for i, k in ipairs(heads) do + local cell = { + name = k, + value = tonumber(data.value[i - 1]), + } + c = c + 1 + vs[c] = cell + end + self:appendLine(self:_packProto("self_statm", nil, vs)) + end + + self:push(lines) +end + +return CprocStatm -- Gitee From f8cbed319c2a66c44023b11a363be82563510f99 Mon Sep 17 00:00:00 2001 From: stephanie <1165643831@qq.com> Date: Wed, 5 Jul 2023 06:21:36 +0000 Subject: [PATCH 2/5] Revert "add " This reverts commit 2a38f94211ba6e345ff69cfc9bed1cfe66b6348d. --- .gitignore | 2 +- .../unity/beaver/native/local_beaver.c | 1 - .../unity/collector/observe/observe_mem.lua | 5 --- .../unity/collector/observe/observe_sche.lua | 43 ------------------- 4 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 source/tools/monitor/unity/collector/observe/observe_mem.lua delete mode 100644 source/tools/monitor/unity/collector/observe/observe_sche.lua diff --git a/.gitignore b/.gitignore index 40a844cf..cab19059 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ *.o.cmd *.ko *.ko.cmd -*.idea + Module.symvers modules.builtin modules.order diff --git a/source/tools/monitor/unity/beaver/native/local_beaver.c b/source/tools/monitor/unity/beaver/native/local_beaver.c index 63490781..8e83a8b5 100644 --- a/source/tools/monitor/unity/beaver/native/local_beaver.c +++ b/source/tools/monitor/unity/beaver/native/local_beaver.c @@ -4,7 +4,6 @@ #include "local_beaver.h" #include -#include #include #include #include diff --git a/source/tools/monitor/unity/collector/observe/observe_mem.lua b/source/tools/monitor/unity/collector/observe/observe_mem.lua deleted file mode 100644 index 85f7cc5b..00000000 --- a/source/tools/monitor/unity/collector/observe/observe_mem.lua +++ /dev/null @@ -1,5 +0,0 @@ ---- ---- Generated by EmmyLua(https://github.com/EmmyLua) ---- Created by wrp. ---- DateTime: 2023/7/4 19:39 ---- \ No newline at end of file diff --git a/source/tools/monitor/unity/collector/observe/observe_sche.lua b/source/tools/monitor/unity/collector/observe/observe_sche.lua deleted file mode 100644 index 4ee7d405..00000000 --- a/source/tools/monitor/unity/collector/observe/observe_sche.lua +++ /dev/null @@ -1,43 +0,0 @@ ---- ---- Generated by EmmyLua(https://github.com/EmmyLua) ---- Created by wrp. ---- DateTime: 2023/7/4 19:37 ---- - -require("common.class") -local unistd = require("posix.unistd") -local CvProto = require("collector.vproto") -local CobserveSche = class("observeSche",CvProto) - -local pid = 1 - -function CobserveSche:_init_(proto, pffi, mnt, pFile) - CvProto._init_(self, proto) - self.pFile = mnt .. pFile - self._fsche = "/proc/" .. pid .. "/schedstat" -end - -function CprocStatm:proc(elapsed, lines) - - local heads = {"size", "resident", "shared", "text", "lib", "data", "dt"} - local c = 0 - for line in io.lines(self._fstatm) do - local vs = {} - local data = self._ffi.new("var_long_t") - assert(self._cffi.var_input_long(self._ffi.string(line), data) == 0) - assert(data.no == 7) - for i, k in ipairs(heads) do - local cell = { - name = k, - value = tonumber(data.value[i - 1]), - } - c = c + 1 - vs[c] = cell - end - self:appendLine(self:_packProto("self_statm", nil, vs)) - end - - self:push(lines) -end - -return CprocStatm -- Gitee From bf8dcd41b207fb5bb4e12f8cbbc2c1b0edcff507 Mon Sep 17 00:00:00 2001 From: wrp Date: Wed, 5 Jul 2023 11:50:19 +0800 Subject: [PATCH 3/5] add sys/socket.h --- .gitignore | 2 +- source/tools/monitor/unity/beaver/native/local_beaver.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index cab19059..40a844cf 100644 --- a/.gitignore +++ b/.gitignore @@ -5,7 +5,7 @@ *.o.cmd *.ko *.ko.cmd - +*.idea Module.symvers modules.builtin modules.order diff --git a/source/tools/monitor/unity/beaver/native/local_beaver.c b/source/tools/monitor/unity/beaver/native/local_beaver.c index 8e83a8b5..63490781 100644 --- a/source/tools/monitor/unity/beaver/native/local_beaver.c +++ b/source/tools/monitor/unity/beaver/native/local_beaver.c @@ -4,6 +4,7 @@ #include "local_beaver.h" #include +#include #include #include #include -- Gitee From 4ffc1213b552f100b5f4de2d80aba8ec6c91e2d0 Mon Sep 17 00:00:00 2001 From: wrp Date: Thu, 6 Jul 2023 16:58:37 +0800 Subject: [PATCH 4/5] fixed set reusedport error --- source/tools/monitor/unity/beaver/localBeaver.lua | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/source/tools/monitor/unity/beaver/localBeaver.lua b/source/tools/monitor/unity/beaver/localBeaver.lua index 5267a347..b6ec038e 100644 --- a/source/tools/monitor/unity/beaver/localBeaver.lua +++ b/source/tools/monitor/unity/beaver/localBeaver.lua @@ -92,14 +92,13 @@ function CLocalBeaver:_installFFI() end -function CLocalBeaver:localBind(fd, tPort) +local function localBind(cffi, fd, tPort) local try = 0 local res, err, errno -- can reuse for time wait socket. --res, err, errno = socket.setsockopt(fd, socket.SOL_SOCKET, socket.SO_REUSEADDR, 1); - print(self) - res = self._cffi.setsockopt_AP(fd) + res = cffi.setsockopt_AP(fd) if res<0 then system:posixError("set sock opt failed."); end @@ -124,7 +123,7 @@ function CLocalBeaver:_install_fd_unisock(backlog,unix_socket) fd, err, errno = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM, 0) if fd then -- for socket local tPort = {family=socket.AF_UNIX, path=unix_socket} - local r, msg = pcall(localBind, fd, tPort) + local r, msg = pcall(localBind, self._cffi, fd, tPort) if r then res, err, errno = socket.listen(fd, backlog) if res then -- for listen @@ -148,7 +147,7 @@ function CLocalBeaver:_install_fd(port, ip, backlog) fd, err, errno = socket.socket(socket.AF_INET, socket.SOCK_STREAM, 0) if fd then -- for socket local tPort = {family=socket.AF_INET, addr=ip, port=port} - local r, msg = pcall(localBind, fd, tPort) + local r, msg = pcall(localBind, self._cffi, fd, tPort) if r then res, err, errno = socket.listen(fd, backlog) if res then -- for listen -- Gitee From 39df6e630a69781960570f45f613e4e9db9a9093 Mon Sep 17 00:00:00 2001 From: wrp Date: Thu, 6 Jul 2023 17:36:52 +0800 Subject: [PATCH 5/5] fix set reusedport error --- source/tools/monitor/unity/beaver/localBeaver.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/tools/monitor/unity/beaver/localBeaver.lua b/source/tools/monitor/unity/beaver/localBeaver.lua index b6ec038e..d0c2c5de 100644 --- a/source/tools/monitor/unity/beaver/localBeaver.lua +++ b/source/tools/monitor/unity/beaver/localBeaver.lua @@ -133,7 +133,7 @@ function CLocalBeaver:_install_fd_unisock(backlog,unix_socket) system:posixError("socket listen failed", err, errno) end else - print(msg) + print("call localBind failed, report: " .. msg) unistd.close(fd) os.exit(1) end @@ -157,7 +157,7 @@ function CLocalBeaver:_install_fd(port, ip, backlog) system:posixError("socket listen failed", err, errno) end else - print(msg) + print("call localBind failed, report: " .. msg) unistd.close(fd) os.exit(1) end -- Gitee