liubin/icebergs
1
0
Fork 0
forked from x/icebergs
Code Pull Requests Activity

opt bench

Browse Source
This commit is contained in:
shaoying 2020-06-15 09:56:03 +08:00
parent b313fd186b
commit 7b1103fc85
4 changed files with 172 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
core/code/bench.go
View File

@ -14,13 +14,27 @@ import (
const ( const (
BENCH = "bench" BENCH = "bench"
NCONN = "nconn"
NREQS = "nreqs"
) )
func _bench_list(m *ice.Message, zone string, id string, field ...interface{}) { func _bench_list(m *ice.Message, zone string, id string, field ...interface{}) {
m.RichList(BENCH, zone, id, field) m.Richs(BENCH, nil, kit.Select(kit.MDB_FOREACH, zone), func(key string, val map[string]interface{}) {
if zone = kit.Format(kit.Value(val, "meta.zone")); id == "" {
m.Grows(BENCH, kit.Keys(kit.MDB_HASH, key), "", "", func(index int, value map[string]interface{}) {
m.Push(kit.MDB_ZONE, zone)
m.Push("操作", `<input type="button" value="运行">`)
m.Push(zone, value, field...)
})
return
}
m.Grows(BENCH, kit.Keys(kit.MDB_HASH, key), kit.MDB_ID, id, func(index int, value map[string]interface{}) {
m.Push("detail", value)
})
})
} }
func _bench_show(m *ice.Message, nconn, nreq int64, list []*http.Request) { func _bench_show(m *ice.Message, nconn, nreq int64, list []*http.Request) {
m.Info(NCONN, nconn, NREQS, nreq)
nout, e := os.OpenFile("/dev/null", os.O_WRONLY, 0777) nout, e := os.OpenFile("/dev/null", os.O_WRONLY, 0777)
m.Assert(e) m.Assert(e)
@ -34,23 +48,47 @@ func _bench_show(m *ice.Message, nconn, nreq int64, list []*http.Request) {
m.Echo(s.Show()) m.Echo(s.Show())
m.Echo("body: %d\n", body) m.Echo("body: %d\n", body)
} }
func _bench_create(m *ice.Message) { func _bench_create(m *ice.Message, zone string, arg ...string) {
if m.Richs(BENCH, nil, zone, nil) == nil {
m.Rich(BENCH, nil, kit.Data(kit.MDB_ZONE, zone, arg))
m.Log_CREATE(kit.MDB_ZONE, zone)
}
} }
func _bench_insert(m *ice.Message) { func _bench_insert(m *ice.Message, zone, kind, name, text string, nconn, nreqs string, arg ...string) {
m.Richs(BENCH, nil, zone, func(key string, value map[string]interface{}) {
id := m.Grow(BENCH, kit.Keys(kit.MDB_HASH, key), kit.Dict(
kit.MDB_TYPE, kind, kit.MDB_NAME, name, kit.MDB_TEXT, text,
NCONN, nconn, NREQS, nreqs,
kit.MDB_EXTRA, kit.Dict(arg),
))
m.Log_INSERT(kit.MDB_ZONE, zone, kit.MDB_ID, id, kit.MDB_TYPE, kind, kit.MDB_NAME, name)
m.Echo("%d", id)
})
}
func _bench_modify(m *ice.Message, zone, id, pro, set, old string) {
m.Richs(BENCH, nil, kit.Select(kit.MDB_FOREACH, zone), func(key string, val map[string]interface{}) {
m.Grows(BENCH, kit.Keys(kit.MDB_HASH, key), kit.MDB_ID, id, func(index int, value map[string]interface{}) {
switch pro {
case kit.MDB_ZONE, kit.MDB_ID, kit.MDB_TIME:
m.Info("not allow %v", key)
default:
m.Log_MODIFY(kit.MDB_ZONE, zone, kit.MDB_ID, id, kit.MDB_KEY, pro, kit.MDB_VALUE, set, "old", old)
kit.Value(value, pro, set)
}
})
})
} }
func init() { func init() {
Index.Merge(&ice.Context{ Index.Merge(&ice.Context{
Configs: map[string]*ice.Config{ Configs: map[string]*ice.Config{
BENCH: {Name: "bench", Help: "性能压测", Value: kit.Data( BENCH: {Name: "bench", Help: "性能压测", Value: kit.Data(kit.MDB_SHORT, kit.MDB_ZONE)},
kit.MDB_SHORT, kit.MDB_ZONE,
)},
}, },
Commands: map[string]*ice.Command{ Commands: map[string]*ice.Command{
BENCH: {Name: "bench list nconn nreq", Help: "性能压测", Action: map[string]*ice.Action{ BENCH: {Name: "bench zone=auto id=auto auto", Help: "性能压测", Action: map[string]*ice.Action{
"show": {Name: "show", Help: "运行", Hand: func(m *ice.Message, arg ...string) { kit.MDB_SHOW: {Name: "show", Help: "运行", Hand: func(m *ice.Message, arg ...string) {
list := []*http.Request{} list := []*http.Request{}
target := kit.Select("http://localhost:9020/", arg, 0) target := kit.Select(m.Option(kit.MDB_TEXT))
for _, v := range strings.Split(target, ",") { for _, v := range strings.Split(target, ",") {
switch ls := kit.Split(v); ls[0] { switch ls := kit.Split(v); ls[0] {
case http.MethodPost: case http.MethodPost:
@ -67,18 +105,22 @@ func init() {
list = append(list, req) list = append(list, req)
} }
} }
m.Echo("%s\n", target) m.Echo("%s \n", target)
_bench_show(m, kit.Int64(kit.Select("3", arg, 1)), kit.Int64(kit.Select("100", arg, 2)), list) _bench_show(m, kit.Int64(kit.Select(m.Option(NCONN))), kit.Int64(kit.Select(m.Option(NREQS))), list)
}}, }},
"create": {Name: "create", Help: "创建", Hand: func(m *ice.Message, arg ...string) { kit.MDB_MODIFY: {Name: "modify key value old", Help: "编辑", Hand: func(m *ice.Message, arg ...string) {
_bench_create(m) _bench_modify(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), arg[0], arg[1], "")
}}, }},
"insert": {Name: "insert", Help: "插入", Hand: func(m *ice.Message, arg ...string) { kit.MDB_INSERT: {Name: "insert zone type name text nconn nreqs", Help: "插入", Hand: func(m *ice.Message, arg ...string) {
_bench_insert(m) _bench_insert(m, arg[0], arg[1], arg[2],
kit.Select("http://localhost:9020/code/bench?cmd="+arg[2], arg, 3),
kit.Select("3", arg, 4), kit.Select("10", arg, 5))
}},
kit.MDB_CREATE: {Name: "create zone", Help: "创建", Hand: func(m *ice.Message, arg ...string) {
_bench_create(m, arg[0])
}}, }},
}, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { }, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
_bench_list(m, BENCH, kit.Select("", arg, 0), kit.Select("", arg, 1)) _bench_list(m, kit.Select(kit.MDB_FOREACH, arg, 0), kit.Select("", arg, 1))
}}, }},
"/bench": {Name: "/bench cmd...", Help: "性能压测", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { "/bench": {Name: "/bench cmd...", Help: "性能压测", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
m.Cmdy(m.Optionv("cmd")) m.Cmdy(m.Optionv("cmd"))

161
core/code/pprof.go
View File

@ -10,65 +10,122 @@ import (
) )
const ( const (
PPROF = "pprof" PPROF = "pprof"
BINNARY = "binnary"
SERVICE = "service"
SECONDS = "seconds"
) )
func _pprof_list(m *ice.Message, zone string, id string, field ...interface{}) {
m.Richs(PPROF, nil, kit.Select(kit.MDB_FOREACH, zone), func(key string, val map[string]interface{}) {
val = val[kit.MDB_META].(map[string]interface{})
if zone = kit.Format(kit.Value(val, kit.MDB_ZONE)); id == "" {
m.Grows(PPROF, kit.Keys(kit.MDB_HASH, key), "", "", func(index int, value map[string]interface{}) {
// 查看信息
m.Push(kit.MDB_ZONE, zone)
m.Push(BINNARY, val[BINNARY])
m.Push(SERVICE, val[SERVICE])
m.Push(SECONDS, val[SECONDS])
m.Push("操作", `<input type="button" value="运行">`)
m.Push(zone, value, []string{kit.MDB_TYPE, kit.MDB_NAME, kit.MDB_TEXT})
})
return
}
m.Grows(PPROF, kit.Keys(kit.MDB_HASH, key), kit.MDB_ID, id, func(index int, value map[string]interface{}) {
// 查看信息
m.Push("detail", value)
})
})
}
func _pprof_show(m *ice.Message, zone string, seconds string) {
m.Richs(PPROF, nil, zone, func(key string, val map[string]interface{}) {
val = val[kit.MDB_META].(map[string]interface{})
m.Gos(m.Spawn(), func(msg *ice.Message) {
m.Sleep("1s").Grows(PPROF, kit.Keys(kit.MDB_HASH, key), "", "", func(index int, value map[string]interface{}) {
// 压测命令
m.Cmd(ice.WEB_FAVOR, "pprof", "shell", value[kit.MDB_TEXT], m.Cmdx(kit.Split(kit.Format(value[kit.MDB_TEXT]))))
})
})
// 启动监控
name := zone + ".pd.gz"
msg := m.Cmd(ice.WEB_SPIDE, "self", "cache", "GET", kit.Select("/code/pprof/profile", val[SERVICE]), "seconds", kit.Select("5", seconds))
m.Cmd(ice.WEB_FAVOR, "pprof", "shell", "text", m.Cmdx(ice.CLI_SYSTEM, "go", "tool", "pprof", "-text", msg.Append("text")))
m.Cmd(ice.WEB_FAVOR, "pprof", "pprof", name, msg.Append("data"))
// 展示结果
p := kit.Format("%s:%s", m.Conf(ice.WEB_SHARE, "meta.host"), m.Cmdx("tcp.getport"))
m.Cmd(ice.CLI_DAEMON, "go", "tool", "pprof", "-http="+p, val[BINNARY], msg.Append("text"))
m.Cmd(ice.WEB_FAVOR, "pprof", "bin", val[BINNARY], m.Cmd(ice.WEB_CACHE, "catch", "bin", val[BINNARY]).Append("data"))
m.Cmd(ice.WEB_FAVOR, "pprof", "spide", msg.Append("text"), "http://"+p)
m.Echo(p)
})
}
func _pprof_modify(m *ice.Message, zone, id, pro, set, old string) {
m.Richs(PPROF, nil, kit.Select(kit.MDB_FOREACH, zone), func(key string, val map[string]interface{}) {
switch pro {
case kit.MDB_ZONE, kit.MDB_ID, kit.MDB_TIME:
m.Warn(true, "deny modify %v", pro)
return
case BINNARY, SERVICE, SECONDS:
// 修改信息
m.Log_MODIFY(kit.MDB_ZONE, zone, kit.MDB_KEY, pro, kit.MDB_VALUE, set, "old", old)
val = val[kit.MDB_META].(map[string]interface{})
kit.Value(val, pro, set)
return
}
m.Grows(PPROF, kit.Keys(kit.MDB_HASH, key), kit.MDB_ID, id, func(index int, value map[string]interface{}) {
// 修改信息
m.Log_MODIFY(kit.MDB_ZONE, zone, kit.MDB_ID, id, kit.MDB_KEY, pro, kit.MDB_VALUE, set, "old", old)
kit.Value(value, pro, set)
})
})
}
func _pprof_insert(m *ice.Message, zone, kind, name, text string, arg ...string) {
m.Richs(PPROF, nil, zone, func(key string, val map[string]interface{}) {
id := m.Grow(PPROF, kit.Keys(kit.MDB_HASH, key), kit.Dict(
kit.MDB_TYPE, kind, kit.MDB_NAME, name, kit.MDB_TEXT, text,
// 添加信息
kit.MDB_EXTRA, kit.Dict(arg),
))
m.Log_INSERT(kit.MDB_ZONE, zone, kit.MDB_ID, id, kit.MDB_TYPE, kind, kit.MDB_NAME, name)
m.Echo("%d", id)
})
}
func _pprof_create(m *ice.Message, zone string, binnary, service string, seconds string, arg ...string) {
if m.Richs(PPROF, nil, zone, nil) == nil {
m.Rich(PPROF, nil, kit.Data(kit.MDB_ZONE, zone,
// 添加信息
BINNARY, binnary, SERVICE, service, SECONDS, seconds, arg))
m.Log_CREATE(kit.MDB_ZONE, zone)
}
}
func init() { func init() {
Index.Merge(&ice.Context{ Index.Merge(&ice.Context{
Configs: map[string]*ice.Config{ Configs: map[string]*ice.Config{
"pprof": {Name: "pprof", Help: "性能分析", Value: kit.Data(kit.MDB_SHORT, kit.MDB_NAME, PPROF: {Name: "pprof", Help: "性能分析", Value: kit.Data(kit.MDB_SHORT, kit.MDB_ZONE)},
"stop", "ps aux|grep pprof|grep -v grep|cut -d' ' -f2|xargs -n1 kill",
)},
}, },
Commands: map[string]*ice.Command{ Commands: map[string]*ice.Command{
"pprof": {Name: "pprof run name time", Help: "性能分析", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { PPROF: {Name: "pprof zone=auto id=auto auto", Help: "性能分析", Action: map[string]*ice.Action{
if m.Show(cmd, arg...) { kit.MDB_CREATE: {Name: "create zone [binnary [service [seconds]]]", Help: "创建", Hand: func(m *ice.Message, arg ...string) {
return _pprof_create(m, arg[0], kit.Select("bin/ice.bin", arg, 1),
} kit.Select("http://localhost:9020/code/pprof/profile", arg, 2), kit.Select("3", arg, 3))
}},
switch arg[0] { kit.MDB_INSERT: {Name: "insert zone type name text", Help: "插入", Hand: func(m *ice.Message, arg ...string) {
case "run": _pprof_insert(m, arg[0], arg[1], arg[2], kit.Select("http://localhost:9020/code/bench?cmd="+arg[2], arg, 3))
m.Richs(cmd, nil, arg[1], func(key string, value map[string]interface{}) { }},
m.Gos(m.Spawn(), func(msg *ice.Message) { kit.MDB_MODIFY: {Name: "modify key value old", Help: "编辑", Hand: func(m *ice.Message, arg ...string) {
m.Sleep("1s").Grows(cmd, kit.Keys(kit.MDB_HASH, key), "", "", func(index int, value map[string]interface{}) { _pprof_modify(m, m.Option(kit.MDB_ZONE), m.Option(kit.MDB_ID), arg[0], arg[1], kit.Select("", arg, 2))
// 压测命令 }},
m.Cmd(ice.WEB_FAVOR, "pprof", "shell", value[kit.MDB_TEXT], m.Cmdx(kit.Split(kit.Format(value[kit.MDB_TEXT])))) kit.MDB_SHOW: {Name: "show", Help: "运行", Hand: func(m *ice.Message, arg ...string) {
}) _pprof_show(m, m.Option(kit.MDB_ZONE), m.Option(SECONDS))
}) }},
}, Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
// 启动监控 _pprof_list(m, kit.Select(kit.MDB_FOREACH, arg, 0), kit.Select("", arg, 1))
name := arg[1] + ".pd.gz"
value = value["meta"].(map[string]interface{})
msg := m.Cmd(ice.WEB_SPIDE, "self", "cache", "GET", kit.Select("/code/pprof/profile", value["remote"]), "seconds", kit.Select("5", arg, 2))
m.Cmd(ice.WEB_FAVOR, "pprof", "shell", "text", m.Cmdx(ice.CLI_SYSTEM, "go", "tool", "pprof", "-text", msg.Append("text")))
m.Cmd(ice.WEB_FAVOR, "pprof", "pprof", name, msg.Append("data"))
arg = kit.Simple("web", value[kit.MDB_TEXT], msg.Append("text"))
})
fallthrough
case "web":
// 展示结果
p := kit.Format("%s:%s", m.Conf(ice.WEB_SHARE, "meta.host"), m.Cmdx("tcp.getport"))
m.Cmd(ice.CLI_DAEMON, "go", "tool", "pprof", "-http="+p, arg[1:])
m.Cmd(ice.WEB_FAVOR, "pprof", "bin", arg[1], m.Cmd(ice.WEB_CACHE, "catch", "bin", arg[1]).Append("data"))
m.Cmd(ice.WEB_FAVOR, "pprof", "spide", arg[2], "http://"+p)
m.Echo(p)
case "stop":
m.Cmd(ice.CLI_SYSTEM, "sh", "-c", m.Conf(cmd, "meta.stop"))
case "add":
key := m.Rich(cmd, nil, kit.Data(
kit.MDB_NAME, arg[1], kit.MDB_TEXT, arg[2], "remote", arg[3],
))
for i := 4; i < len(arg)-1; i += 2 {
m.Grow(cmd, kit.Keys(kit.MDB_HASH, key), kit.Dict(
kit.MDB_NAME, arg[i], kit.MDB_TEXT, arg[i+1],
))
}
}
}}, }},
"/pprof/": {Name: "/pprof/", Help: "性能分析", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { "/pprof/": {Name: "/pprof/", Help: "性能分析", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
m.R.URL.Path = strings.Replace("/code"+m.R.URL.Path, "code", "debug", 1) m.R.URL.Path = strings.Replace("/code"+m.R.URL.Path, "code", "debug", 1)

20
data.go
View File

@ -465,23 +465,7 @@ func (m *Message) Show(cmd string, arg ...string) bool {
return false return false
} }
func (m *Message) RichList(prefix string, zone string, id string, field ...interface{}) {
m.Richs(prefix, nil, kit.Select(kit.MDB_FOREACH, zone), func(key string, val map[string]interface{}) {
if zone = kit.Format(kit.Value(val, "meta.zone")); id == "" {
m.Grows(prefix, kit.Keys(kit.MDB_HASH, key), "", "", func(index int, value map[string]interface{}) {
m.Push(zone, value)
m.Push(kit.MDB_ZONE, zone)
})
return
}
m.Grows(prefix, kit.Keys(kit.MDB_HASH, key), kit.MDB_ID, id, func(index int, value map[string]interface{}) {
m.Push("detail", value)
})
})
}
func (m *Message) RichCreate(prefix string, zone string, arg ...string) { func (m *Message) RichCreate(prefix string, zone string, arg ...string) {
if m.Richs(prefix, nil, zone, nil) == nil { }
m.Rich(prefix, nil, kit.Data(kit.MDB_ZONE, zone, arg)) func (m *Message) RichInsert(prefix string, zone string, kind, name, text string, data []string, arg ...string) {
m.Log_CREATE(kit.MDB_ZONE, zone)
}
} }

2
misc/input/input.go
View File

@ -242,7 +242,7 @@ var Index = &ice.Context{Name: "input", Help: "输入法",
"demo": {Name: "demo list nconn nreq", Help: "导入词库", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) { "demo": {Name: "demo list nconn nreq", Help: "导入词库", Hand: func(m *ice.Message, c *ice.Context, cmd string, arg ...string) {
conf, e := conf.Open(kit.Select("hi.shy", arg, 0)) conf, e := conf.Open(kit.Select("hi.shy", arg, 0))
m.Assert(e) m.Assert(e)
m.Echo(conf.Get("hi")) m.Echo(conf.Get("he"))
}}, }},
}, },
} }