Cosmetic fixes in port.go.

This closes #5 on GitHub.
From 615369a29511c6021e5623070f082fdb17ff37a2
This commit is contained in:
Sergey Fedchenko
2017-09-08 14:10:23 -07:00
parent 409dcd3a79
commit 22c6805949

View File

@@ -134,18 +134,19 @@ func nxt_go_port_send(pid C.int, id C.int, buf unsafe.Pointer, buf_size C.int,
p := find_port(key) p := find_port(key)
if p != nil { if p == nil {
n, oobn, err := p.snd.WriteMsgUnix(C.GoBytes(buf, buf_size), return 0
C.GoBytes(oob, oob_size), nil)
if err != nil {
fmt.Printf("write result %d (%d), %s\n", n, oobn, err)
}
return C.int(n)
} }
return 0 n, oobn, err := p.snd.WriteMsgUnix(C.GoBytes(buf, buf_size),
C.GoBytes(oob, oob_size), nil)
if err != nil {
fmt.Printf("write result %d (%d), %s\n", n, oobn, err)
}
return C.int(n)
} }
//export nxt_go_main_send //export nxt_go_main_send
@@ -154,18 +155,18 @@ func nxt_go_main_send(buf unsafe.Pointer, buf_size C.int, oob unsafe.Pointer,
p := main_port() p := main_port()
if p != nil { if p == nil {
n, oobn, err := p.snd.WriteMsgUnix(C.GoBytes(buf, buf_size), return 0
C.GoBytes(oob, oob_size), nil)
if err != nil {
fmt.Printf("write result %d (%d), %s\n", n, oobn, err)
}
return C.int(n)
} }
return 0 n, oobn, err := p.snd.WriteMsgUnix(C.GoBytes(buf, buf_size),
C.GoBytes(oob, oob_size), nil)
if err != nil {
fmt.Printf("write result %d (%d), %s\n", n, oobn, err)
}
return C.int(n)
} }
func new_port(pid int, id int, t int, rcv int, snd int) *port { func new_port(pid int, id int, t int, rcv int, snd int) *port {
@@ -200,26 +201,27 @@ func (p *port) read(handler http.Handler) error {
if c_req == 0 { if c_req == 0 {
m.Close() m.Close()
} else { return nil
r := find_request(c_req)
go func(r *request) {
if handler == nil {
handler = http.DefaultServeMux
}
handler.ServeHTTP(r.response(), &r.req)
r.done()
}(r)
if len(r.msgs) == 0 {
r.push(m)
} else if r.ch != nil {
r.ch <- m
} else {
m.Close()
}
} }
return err r := find_request(c_req)
go func(r *request) {
if handler == nil {
handler = http.DefaultServeMux
}
handler.ServeHTTP(r.response(), &r.req)
r.done()
}(r)
if len(r.msgs) == 0 {
r.push(m)
} else if r.ch != nil {
r.ch <- m
} else {
m.Close()
}
return nil
} }