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

Cosmetic changes to remove some annoying valgrind messages.

Browse Source
This commit is contained in:
Max Romanov
2017-07-07 16:01:34 +03:00
parent 264ae98d49
commit 61008a7c0b
3 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/nxt_clang.h
View File

@@ -230,4 +230,6 @@ nxt_trunc_ptr(p, a) \
(u_char *) ((uintptr_t) (p) & ~((uintptr_t) (a) - 1)) (u_char *) ((uintptr_t) (p) & ~((uintptr_t) (a) - 1))
#define NXT_PACKED __attribute__((packed))
#endif /* _NXT_CLANG_H_INCLUDED_ */ #endif /* _NXT_CLANG_H_INCLUDED_ */

4
src/nxt_port.h
View File

@@ -30,7 +30,7 @@ typedef struct {
/* Message data send using mmap, next chunk is a nxt_port_mmap_msg_t. */ /* Message data send using mmap, next chunk is a nxt_port_mmap_msg_t. */
uint8_t mmap; /* 1 bit */ uint8_t mmap; /* 1 bit */
} nxt_port_msg_t; } NXT_PACKED nxt_port_msg_t;
typedef struct { typedef struct {
@@ -91,7 +91,7 @@ typedef struct {
size_t max_size; size_t max_size;
size_t max_share; size_t max_share;
nxt_process_type_t type:8; nxt_process_type_t type:8;
} nxt_port_msg_new_port_t; } NXT_PACKED nxt_port_msg_new_port_t;
/* /*

8
src/nxt_socketpair.c
View File

@@ -188,6 +188,10 @@ nxt_sendmsg(nxt_socket_t s, nxt_fd_t fd, nxt_iobuf_t *iob, nxt_uint_t niob)
msg.msg_control = (caddr_t) &cmsg; msg.msg_control = (caddr_t) &cmsg;
msg.msg_controllen = sizeof(cmsg); msg.msg_controllen = sizeof(cmsg);
#if (NXT_VALGRIND)
nxt_memzero(&cmsg, sizeof(cmsg));
#endif
cmsg.cm.cmsg_len = CMSG_LEN(sizeof(int)); cmsg.cm.cmsg_len = CMSG_LEN(sizeof(int));
cmsg.cm.cmsg_level = SOL_SOCKET; cmsg.cm.cmsg_level = SOL_SOCKET;
cmsg.cm.cmsg_type = SCM_RIGHTS; cmsg.cm.cmsg_type = SCM_RIGHTS;
@@ -231,6 +235,10 @@ nxt_recvmsg(nxt_socket_t s, nxt_fd_t *fd, nxt_iobuf_t *iob, nxt_uint_t niob)
*fd = -1; *fd = -1;
#if (NXT_VALGRIND)
nxt_memzero(&cmsg, sizeof(cmsg));
#endif
n = recvmsg(s, &msg, 0); n = recvmsg(s, &msg, 0);
if (n > 0 if (n > 0