Merged with the default branch.1.26.0-1

2 files changed, 20 insertions, 12 deletions

diff --git a/go/nxt_cgo_lib.c b/go/nxt_cgo_lib.c
index 330697c1..ca9fc3ab 100644
--- a/go/nxt_cgo_lib.c
+++ b/go/nxt_cgo_lib.c
@@ -10,10 +10,10 @@
 #include <nxt_unit_request.h>
 
 
-static ssize_t nxt_cgo_port_send(nxt_unit_ctx_t *, nxt_unit_port_t *port,
+static ssize_t nxt_cgo_port_send(nxt_unit_ctx_t *ctx, nxt_unit_port_t *port,
     const void *buf, size_t buf_size, const void *oob, size_t oob_size);
-static ssize_t nxt_cgo_port_recv(nxt_unit_ctx_t *, nxt_unit_port_t *port,
-    void *buf, size_t buf_size, void *oob, size_t oob_size);
+static ssize_t nxt_cgo_port_recv(nxt_unit_ctx_t *ctx, nxt_unit_port_t *port,
+    void *buf, size_t buf_size, void *oob, size_t *oob_size);
 
 int
 nxt_cgo_run(uintptr_t handler)
@@ -30,6 +30,7 @@ nxt_cgo_run(uintptr_t handler)
     init.callbacks.port_send       = nxt_cgo_port_send;
     init.callbacks.port_recv       = nxt_cgo_port_recv;
     init.callbacks.shm_ack_handler = nxt_go_shm_ack_handler;
+    init.callbacks.ready_handler   = nxt_go_ready;
 
     init.data = (void *) handler;
 
@@ -57,7 +58,7 @@ nxt_cgo_port_send(nxt_unit_ctx_t *ctx, nxt_unit_port_t *port,
 
 static ssize_t
 nxt_cgo_port_recv(nxt_unit_ctx_t *ctx, nxt_unit_port_t *port,
-    void *buf, size_t buf_size, void *oob, size_t oob_size)
+    void *buf, size_t buf_size, void *oob, size_t *oob_size)
 {
     return nxt_go_port_recv(port->id.pid, port->id.id,
                             buf, buf_size, oob, oob_size);
diff --git a/go/port.go b/go/port.go
index 78351322..6635e87c 100644
--- a/go/port.go
+++ b/go/port.go
@@ -110,17 +110,21 @@ func nxt_go_add_port(ctx *C.nxt_unit_ctx_t, p *C.nxt_unit_port_t) C.int {
 	p.in_fd = -1
 	p.out_fd = -1
 
-	if new_port.key.id == 65535 {
-		go func(ctx *C.nxt_unit_ctx_t) {
-			C.nxt_unit_run_shared(ctx);
-		}(ctx)
-	}
+	return C.NXT_UNIT_OK
+}
+
+//export nxt_go_ready
+func nxt_go_ready(ctx *C.nxt_unit_ctx_t) C.int {
+	go func(ctx *C.nxt_unit_ctx_t) {
+		C.nxt_unit_run_shared(ctx)
+	}(ctx)
 
 	return C.NXT_UNIT_OK
 }
 
 //export nxt_go_remove_port
-func nxt_go_remove_port(unit *C.nxt_unit_t, p *C.nxt_unit_port_t) {
+func nxt_go_remove_port(unit *C.nxt_unit_t, ctx *C.nxt_unit_ctx_t,
+	p *C.nxt_unit_port_t) {
 
 	key := port_key{
 		pid: int(p.id.pid),
@@ -165,7 +169,7 @@ func nxt_go_port_send(pid C.int, id C.int, buf unsafe.Pointer, buf_size C.int,
 
 //export nxt_go_port_recv
 func nxt_go_port_recv(pid C.int, id C.int, buf unsafe.Pointer, buf_size C.int,
-	oob unsafe.Pointer, oob_size C.int) C.ssize_t {
+	oob unsafe.Pointer, oob_size *C.size_t) C.ssize_t {
 
 	key := port_key{
 		pid: int(pid),
@@ -180,7 +184,7 @@ func nxt_go_port_recv(pid C.int, id C.int, buf unsafe.Pointer, buf_size C.int,
 	}
 
 	n, oobn, _, _, err := p.rcv.ReadMsgUnix(GoBytes(buf, buf_size),
-		GoBytes(oob, oob_size))
+		GoBytes(oob, C.int(*oob_size)))
 
 	if err != nil {
 		if nerr, ok := err.(*net.OpError); ok {
@@ -192,6 +196,9 @@ func nxt_go_port_recv(pid C.int, id C.int, buf unsafe.Pointer, buf_size C.int,
 		nxt_go_warn("read result %d (%d), %s", n, oobn, err)
 
 		n = -1
+
+	} else {
+		*oob_size = C.size_t(oobn)
 	}
 
 	return C.ssize_t(n)