code clean

This commit is contained in:
Li Jie
2024-09-07 10:20:02 +08:00
parent 75fe9d61a3
commit d2538d08a7
5 changed files with 20 additions and 28 deletions

View File

@@ -25,6 +25,6 @@ type Void = [0]byte
type Future[T any] func(func(T))
// Just for pure LLGo/Go, transpile to callback in Go+
func Await[T1 any](call Future[T1]) (ret T1) {
return Run(call)
func Await[T1 any](future Future[T1]) T1 {
return Run(future)
}

View File

@@ -19,16 +19,7 @@
package async
var exec = &Executor{}
type Executor struct {
}
func Exec() *Executor {
return exec
}
func Run[T any](future Future[T]) (ret T) {
func Run[T any](future Future[T]) T {
ch := make(chan T)
go func() {
future(func(v T) {

View File

@@ -54,15 +54,16 @@ func (e *Executor) Run() {
e.L.Run(libuv.RUN_DEFAULT)
}
func Run[T any](future Future[T]) (ret T) {
func Run[T any](future Future[T]) T {
loop := libuv.LoopNew()
exec := &Executor{loop}
oldExec := setExec(exec)
var ret T
future(func(v T) {
ret = v
})
exec.Run()
loop.Close()
setExec(oldExec)
return
return ret
}

View File

@@ -52,22 +52,22 @@ type bind3[Base any, A any, B any, C any] struct {
fn func(*Base, A, B, C)
}
func Callback[Base any](base *Base) {
func callback[Base any](base *Base) {
bind := (*bind[Base])(unsafe.Pointer(base))
bind.fn(base)
}
func Callback1[Base any, A any](base *Base, a A) {
func callback1[Base any, A any](base *Base, a A) {
bind := (*bind1[Base, A])(unsafe.Pointer(base))
bind.fn(base, a)
}
func Callback2[Base any, A any, B any](base *Base, a A, b B) {
func callback2[Base any, A any, B any](base *Base, a A, b B) {
bind := (*bind2[Base, A, B])(unsafe.Pointer(base))
bind.fn(base, a, b)
}
func Callback3[Base any, A any, B any, C any](base *Base, a A, b B, c C) {
func callback3[Base any, A any, B any, C any](base *Base, a A, b B, c C) {
bind := (*bind3[Base, A, B, C])(unsafe.Pointer(base))
bind.fn(base, a, b, c)
}
@@ -89,55 +89,55 @@ func Callback3[Base any, A any, B any, C any](base *Base, a A, b B, c C) {
func Bind[T any](call func(*T)) (p *T, cb Cb[T]) {
bb := &bind[T]{fn: call}
p = (*T)(unsafe.Pointer(bb))
cb = Callback[T]
cb = callback[T]
return
}
func BindF[T any, F ~func(*T)](call func(*T)) (*T, F) {
bb := &bind[T]{fn: call}
p := (*T)(unsafe.Pointer(bb))
var fn F = Callback[T]
var fn F = callback[T]
return p, fn
}
func Bind1[T any, A any](call func(*T, A)) (p *T, cb Cb1[T, A]) {
bb := &bind1[T, A]{fn: call}
p = (*T)(unsafe.Pointer(bb))
cb = Callback1[T, A]
cb = callback1[T, A]
return
}
func Bind1F[T any, F ~func(*T, A), A any](call func(*T, A)) (*T, F) {
bb := &bind1[T, A]{fn: call}
p := (*T)(unsafe.Pointer(bb))
var fn F = Callback1[T, A]
var fn F = callback1[T, A]
return p, fn
}
func Bind2[T any, A any, B any](call func(*T, A, B)) (p *T, cb Cb2[T, A, B]) {
bb := &bind2[T, A, B]{fn: call}
p = (*T)(unsafe.Pointer(bb))
cb = Callback2[T, A, B]
cb = callback2[T, A, B]
return
}
func Bind2F[T any, F ~func(*T, A, B), A any, B any](call func(*T, A, B)) (*T, F) {
bb := &bind2[T, A, B]{fn: call}
p := (*T)(unsafe.Pointer(bb))
var fn F = Callback2[T, A, B]
var fn F = callback2[T, A, B]
return p, fn
}
func Bind3[T any, A any, B any, C any](call func(*T, A, B, C), a A, b B, c C) (p *T, cb Cb3[T, A, B, C]) {
bb := &bind3[T, A, B, C]{fn: call}
p = (*T)(unsafe.Pointer(bb))
cb = Callback3[T, A, B, C]
cb = callback3[T, A, B, C]
return
}
func Bind3F[T any, F ~func(*T, A, B, C), A any, B any, C any](call func(*T, A, B, C), a A, b B, c C) (*T, F) {
bb := &bind3[T, A, B, C]{fn: call}
p := (*T)(unsafe.Pointer(bb))
var fn F = Callback3[T, A, B, C]
var fn F = callback3[T, A, B, C]
return p, fn
}

View File

@@ -241,7 +241,7 @@ func (t *Conn) Read() async.Future[tuple.Tuple2[[]byte, error]] {
func (t *Conn) Write(data []byte) async.Future[error] {
return async.Async(func(resolve func(error)) {
writer, _ := cbind.Bind1[libuv.Write](func(req *libuv.Write, status c.Int) {
writer, cb := cbind.Bind1F[libuv.Write, libuv.WriteCb](func(req *libuv.Write, status c.Int) {
var result error
if status != 0 {
result = libuvError(libuv.Errno(status))
@@ -251,7 +251,7 @@ func (t *Conn) Write(data []byte) async.Future[error] {
tcp := (*libuv.Stream)(&t.tcp)
buf, len := cbind.CBuffer(data)
bufs := &libuv.Buf{Base: buf, Len: uintptr(len)}
writer.Write(tcp, bufs, 1, cbind.Callback1[libuv.Write, c.Int])
writer.Write(tcp, bufs, 1, cb)
})
}