lihao/skynet
1
0
Fork 0
mirror of https://github.com/cloudwu/skynet.git synced 2026-07-24 12:20:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

udp send don't need inc/dec sending ref, see issue #794

Browse Source
This commit is contained in:
Cloud Wu
2018-01-25 15:55:45 +08:00
parent 04f4004934
commit cd99557368
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
skynet-src/socket_server.c
View File

@@ -43,6 +43,7 @@
#define PROTOCOL_TCP 0 #define PROTOCOL_TCP 0
#define PROTOCOL_UDP 1 #define PROTOCOL_UDP 1
#define PROTOCOL_UDPv6 2 #define PROTOCOL_UDPv6 2
#define PROTOCOL_UNKNOWN 255
#define UDP_ADDRESS_SIZE 19 // ipv6 128bit + port 16bit + 1 byte type #define UDP_ADDRESS_SIZE 19 // ipv6 128bit + port 16bit + 1 byte type
@@ -303,6 +304,7 @@ reserve_id(struct socket_server *ss) {
if (s->type == SOCKET_TYPE_INVALID) { if (s->type == SOCKET_TYPE_INVALID) {
if (ATOM_CAS(&s->type, SOCKET_TYPE_INVALID, SOCKET_TYPE_RESERVE)) { if (ATOM_CAS(&s->type, SOCKET_TYPE_INVALID, SOCKET_TYPE_RESERVE)) {
s->id = id; s->id = id;
s->protocol = PROTOCOL_UNKNOWN;
// socket_server_udp_connect may inc s->udpconncting directly (from other thread, before new_fd), // socket_server_udp_connect may inc s->udpconncting directly (from other thread, before new_fd),
// so reset it to 0 here rather than in new_fd. // so reset it to 0 here rather than in new_fd.
s->udpconnecting = 0; s->udpconnecting = 0;
@@ -1057,6 +1059,8 @@ set_udp_address(struct socket_server *ss, struct request_setudp *request, struct
static inline void static inline void
inc_sending_ref(struct socket *s, int id) { inc_sending_ref(struct socket *s, int id) {
if (s->protocol != PROTOCOL_TCP)
return;
for (;;) { for (;;) {
uint32_t sending = s->sending; uint32_t sending = s->sending;
if ((sending >> 16) == ID_TAG16(id)) { if ((sending >> 16) == ID_TAG16(id)) {
@@ -1078,7 +1082,8 @@ inc_sending_ref(struct socket *s, int id) {
static inline void static inline void
dec_sending_ref(struct socket_server *ss, int id) { dec_sending_ref(struct socket_server *ss, int id) {
struct socket * s = &ss->slot[HASH_ID(id)]; struct socket * s = &ss->slot[HASH_ID(id)];
if (s->id == id) { // Notice: udp may inc sending while type == SOCKET_TYPE_RESERVE
if (s->id == id && s->protocol == PROTOCOL_TCP) {
assert((s->sending & 0xffff) != 0); assert((s->sending & 0xffff) != 0);
ATOM_DEC(&s->sending); ATOM_DEC(&s->sending);
} }