technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fixing Go package build.

Browse Source 
Go package build was broken by change 365:28b2a468be43.
This commit is contained in:
Max Romanov
2017-10-19 18:20:08 +03:00
parent f9f852008f
commit c8a8a7c212
5 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/go/unit/nxt_go_port_memory.c
View File

@@ -32,7 +32,7 @@ nxt_go_new_port_mmap(nxt_go_process_t *process, nxt_port_id_t id)
char name[64];
nxt_fd_t fd;
nxt_port_msg_t port_msg;
nxt_port_mmap_t *port_mmap;
nxt_go_port_mmap_t *port_mmap;
nxt_port_mmap_header_t *hdr;
fd = -1;
@@ -162,8 +162,8 @@ nxt_port_mmap_header_t *
nxt_go_port_mmap_get(nxt_go_process_t *process, nxt_port_id_t port_id,
nxt_chunk_id_t *c)
{
nxt_port_mmap_t *port_mmap;
nxt_port_mmap_t *end_port_mmap;
nxt_go_port_mmap_t *port_mmap;
nxt_go_port_mmap_t *end_port_mmap;
nxt_port_mmap_header_t *hdr;
port_mmap = NULL;

6
src/go/unit/nxt_go_port_memory.h
View File

@@ -16,6 +16,12 @@
typedef struct nxt_go_process_s nxt_go_process_t;
#endif
typedef struct nxt_go_port_mmap_s nxt_go_port_mmap_t;
struct nxt_go_port_mmap_s {
nxt_port_mmap_header_t *hdr;
};
struct nxt_port_mmap_header_s *
nxt_go_port_mmap_get(nxt_go_process_t *process, nxt_port_id_t port_id,
nxt_chunk_id_t *c);

7
src/go/unit/nxt_go_process.c
View File

@@ -11,6 +11,7 @@
#include "nxt_go_array.h"
#include "nxt_go_mutex.h"
#include "nxt_go_log.h"
#include "nxt_go_port_memory.h"
#include <nxt_port_memory_int.h>
@@ -89,9 +90,9 @@ nxt_go_get_process(nxt_pid_t pid)
process->pid = pid;
nxt_go_mutex_create(&process->incoming_mutex);
nxt_go_array_init(&process->incoming, 1, sizeof(nxt_port_mmap_t));
nxt_go_array_init(&process->incoming, 1, sizeof(nxt_go_port_mmap_t));
nxt_go_mutex_create(&process->outgoing_mutex);
nxt_go_array_init(&process->outgoing, 1, sizeof(nxt_port_mmap_t));
nxt_go_array_init(&process->outgoing, 1, sizeof(nxt_go_port_mmap_t));
}
return process;
@@ -103,8 +104,8 @@ nxt_go_new_incoming_mmap(nxt_pid_t pid, nxt_fd_t fd)
{
void *mem;
struct stat mmap_stat;
nxt_port_mmap_t *port_mmap;
nxt_go_process_t *process;
nxt_go_port_mmap_t *port_mmap;
process = nxt_go_get_process(pid);

4
src/go/unit/nxt_go_process.h
View File

@@ -19,9 +19,9 @@ typedef struct nxt_go_process_s nxt_go_process_t;
struct nxt_go_process_s {
nxt_pid_t pid;
nxt_go_mutex_t incoming_mutex;
nxt_array_t incoming; /* of nxt_port_mmap_t */
nxt_array_t incoming; /* of nxt_go_port_mmap_t */
nxt_go_mutex_t outgoing_mutex;
nxt_array_t outgoing; /* of nxt_port_mmap_t */
nxt_array_t outgoing; /* of nxt_go_port_mmap_t */
};
nxt_go_process_t *nxt_go_get_process(nxt_pid_t pid);

6
src/go/unit/nxt_go_run_ctx.c
View File

@@ -24,7 +24,7 @@ nxt_go_ctx_msg_rbuf(nxt_go_run_ctx_t *ctx, nxt_go_msg_t *msg, nxt_buf_t *buf,
uint32_t n)
{
size_t nchunks;
nxt_port_mmap_t *port_mmap;
nxt_go_port_mmap_t *port_mmap;
nxt_port_mmap_msg_t *mmap_msg;
if (nxt_slow_path(msg->mmap_msg == NULL)) {
@@ -116,7 +116,7 @@ nxt_go_ctx_release_msg(nxt_go_run_ctx_t *ctx, nxt_go_msg_t *msg)
{
u_char *b, *e;
nxt_chunk_id_t c;
nxt_port_mmap_t *port_mmap;
nxt_go_port_mmap_t *port_mmap;
nxt_port_mmap_msg_t *mmap_msg, *end;
if (nxt_slow_path(msg->mmap_msg == NULL)) {
@@ -235,7 +235,7 @@ nxt_go_port_mmap_get_buf(nxt_go_run_ctx_t *ctx, size_t size)
size_t nchunks;
nxt_buf_t *buf;
nxt_chunk_id_t c;
nxt_port_mmap_t *port_mmap;
nxt_go_port_mmap_t *port_mmap;
nxt_port_mmap_msg_t *mmap_msg;
nxt_port_mmap_header_t *hdr;