diff options
author | 2018-05-18 08:24:47 +0000 | |
---|---|---|
committer | 2018-05-18 08:24:47 +0000 | |
commit | 627968bfe1101e58992b695e74470ab865e88c8d (patch) | |
tree | 5ca85b16cd1ffb62d75da90ef115589bd86c5e4c /src/nSocket | |
parent | 3a8b1b01c87ede23390657b906f14a49d89624f6 (diff) | |
parent | 425c6c2d1ab01b8c8de11e2cba021def2c05574f (diff) |
Merge "Coding style error check and remove some unused macros"
Diffstat (limited to 'src/nSocket')
-rw-r--r-- | src/nSocket/kernel/linux_kernel_module.c | 138 | ||||
-rw-r--r-- | src/nSocket/nstack/nstack_info_parse.c | 8 | ||||
-rw-r--r-- | src/nSocket/nstack/nstack_module.h | 10 | ||||
-rw-r--r-- | src/nSocket/nstack/nstack_nsocket_construct.c | 2 | ||||
-rw-r--r-- | src/nSocket/nstack/nstack_socket.c | 27 |
5 files changed, 87 insertions, 98 deletions
diff --git a/src/nSocket/kernel/linux_kernel_module.c b/src/nSocket/kernel/linux_kernel_module.c index 148cce8..1943b18 100644 --- a/src/nSocket/kernel/linux_kernel_module.c +++ b/src/nSocket/kernel/linux_kernel_module.c @@ -51,26 +51,26 @@ ks_ep_thread (void *arg) int loop = 0; struct epoll_event *events = (struct epoll_event *) malloc (SK_MAX_EP_EVENT * - sizeof (struct epoll_event)); + sizeof (struct epoll_event)); struct epoll_event *innerEvt = (struct epoll_event *) malloc (SK_MAX_EP_EVENT * - sizeof (struct epoll_event)); + sizeof (struct epoll_event)); if (NULL == events || NULL == innerEvt) { NSSOC_LOGERR ("malloc events failed"); if (events) - { - free (events); - events = NULL; /* Set NULL to pointer after free */ - } + { + free (events); + events = NULL; /* Set NULL to pointer after free */ + } if (innerEvt) - { - free (innerEvt); - innerEvt = NULL; /* Set NULL to pointer after free */ - } + { + free (innerEvt); + innerEvt = NULL; /* Set NULL to pointer after free */ + } /* When ks_ep_thread failed, it should set g_ksInfo.thread_inited ks_true, otherwise,it will result kernel_stack_register in dead loop */ g_ksInfo.thread_inited = ks_true; return NULL; @@ -86,16 +86,16 @@ ks_ep_thread (void *arg) g_ksInfo.thread_inited = ks_true; if (events) - { - free (events); - events = NULL; /* Set NULL to pointer after free */ - } + { + free (events); + events = NULL; /* Set NULL to pointer after free */ + } if (innerEvt) - { - free (innerEvt); - innerEvt = NULL; /* Set NULL to pointer after free */ - } + { + free (innerEvt); + innerEvt = NULL; /* Set NULL to pointer after free */ + } return NULL; } @@ -106,57 +106,57 @@ ks_ep_thread (void *arg) { NSTACK_CAL_FUN (&g_ksInfo.libcOps, epoll_wait, - (g_ksInfo.epfd, events, SK_MAX_EP_EVENT, -1), eventNum); + (g_ksInfo.epfd, events, SK_MAX_EP_EVENT, -1), eventNum); if (0 == eventNum) - { - sys_sleep_ns (0, 100000); + { + sys_sleep_ns (0, 100000); - } + } for (loop = 0; loop < eventNum; loop++) - { - - NSSOC_LOGDBG ("Epoll]events=%u,epfd=%d", events[loop].events, - events[loop].data.fd); - - if (events[loop].events & EPOLLIN) - { - int i = 0, num = 0, ret = 0, epfd = events[loop].data.fd; - NSTACK_CAL_FUN (&g_ksInfo.libcOps, epoll_wait, - (epfd, innerEvt, SK_MAX_EP_EVENT, 0), num); - - if (0 == num) - { - NSSOC_LOGWAR ("Num is zero"); - continue; - } - - NSTACK_CAL_FUN (&g_ksInfo.libcOps, epoll_ctl, - (g_ksInfo.epfd, EPOLL_CTL_DEL, epfd, NULL), - ret); - - ret = -1; - for (i = 0; i < num; i++) - { - ret &= - g_ksInfo.regVal.event_cb (innerEvt[i].data.ptr, - innerEvt[i].events); - NSSOC_LOGDBG ("Kernel got one event]i=%d,ptr=%d,events=%u", - i, innerEvt[i].data.ptr, innerEvt[i].events); - } - - if (ret) - { - struct epoll_event ev; - ev.data.fd = epfd; - ev.events = EPOLLIN; - NSTACK_CAL_FUN (&g_ksInfo.libcOps, epoll_ctl, - (g_ksInfo.epfd, EPOLL_CTL_ADD, epfd, &ev), - ret); - } - } - } + { + + NSSOC_LOGDBG ("Epoll]events=%u,epfd=%d", events[loop].events, + events[loop].data.fd); + + if (events[loop].events & EPOLLIN) + { + int i = 0, num = 0, ret = 0, epfd = events[loop].data.fd; + NSTACK_CAL_FUN (&g_ksInfo.libcOps, epoll_wait, + (epfd, innerEvt, SK_MAX_EP_EVENT, 0), num); + + if (0 == num) + { + NSSOC_LOGWAR ("Num is zero"); + continue; + } + + NSTACK_CAL_FUN (&g_ksInfo.libcOps, epoll_ctl, + (g_ksInfo.epfd, EPOLL_CTL_DEL, epfd, NULL), + ret); + + ret = -1; + for (i = 0; i < num; i++) + { + ret &= + g_ksInfo.regVal.event_cb (innerEvt[i].data.ptr, + innerEvt[i].events); + NSSOC_LOGDBG ("Kernel got one event]i=%d,ptr=%d,events=%u", + i, innerEvt[i].data.ptr, innerEvt[i].events); + } + + if (ret) + { + struct epoll_event ev; + ev.data.fd = epfd; + ev.events = EPOLLIN; + NSTACK_CAL_FUN (&g_ksInfo.libcOps, epoll_ctl, + (g_ksInfo.epfd, EPOLL_CTL_ADD, epfd, &ev), + ret); + } + } + } } while (1); @@ -208,14 +208,14 @@ kernel_prewait_proc (int epfd) unsigned int kernel_ep_fd_add (int epFD, int proFD, int ctl_ops, - struct epoll_event *events, void *pdata) + struct epoll_event *events, void *pdata) { struct epoll_event tmpEvt; int ret = 0; tmpEvt.data.ptr = pdata; tmpEvt.events = events->events; NSSOC_LOGINF ("epfd=%d,fd=%d,ops=%d, events=%u", epFD, proFD, ctl_ops, - events->events); + events->events); switch (ctl_ops) { case nstack_ep_triggle_add: @@ -260,8 +260,8 @@ kernel_module_init () if (retval != 0) { NSMON_LOGERR - ("pthread_setname_np failed for ep_thread]retval=%d, errno:%d", - retval, errno); + ("pthread_setname_np failed for ep_thread]retval=%d, errno:%d", + retval, errno); /*set thread name failed no need to return */ } @@ -316,7 +316,7 @@ kernel_stack_register (nstack_proc_cb * ops, nstack_event_cb * val) ops->socket_ops = g_ksInfo.libcOps; MEMSET_S (&(ops->extern_ops), sizeof (ops->extern_ops), 0, - sizeof (ops->extern_ops)); + sizeof (ops->extern_ops)); NSTACK_SET_OPS_FUN (&(ops->socket_ops), listen, lk_listen); NSTACK_SET_OPS_FUN (&(ops->socket_ops), epoll_ctl, lk_epollctl); NSTACK_SET_OPS_FUN (&(ops->socket_ops), socket, kernel_socket); diff --git a/src/nSocket/nstack/nstack_info_parse.c b/src/nSocket/nstack/nstack_info_parse.c index 06c956b..99e6df7 100644 --- a/src/nSocket/nstack/nstack_info_parse.c +++ b/src/nSocket/nstack/nstack_info_parse.c @@ -18,13 +18,13 @@ #define _GNU_SOURCE #endif -#include <sys/types.h> -#include <sys/stat.h> -#include <fcntl.h> +#include <sys/types.h> /* sys/types.h */ +#include <sys/stat.h> /* sys/stat.h */ +#include <fcntl.h> /* fcntl.h */ #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> -#include <errno.h> +#include <errno.h> /* errno.h */ #include "json.h" #include "nsfw_base_linux_api.h" #include "nstack_info_parse.h" diff --git a/src/nSocket/nstack/nstack_module.h b/src/nSocket/nstack/nstack_module.h index 2aa5d3b..ac0b57d 100644 --- a/src/nSocket/nstack/nstack_module.h +++ b/src/nSocket/nstack/nstack_module.h @@ -38,16 +38,6 @@ extern "C"{ #define NSTACK_MAX_MODULE_NUM 8 #define NSTACK_PRO_MODULE 1 -#define MOD_INDEX_FOR_KERNEL 0 -#define MOD_NAME_FOR_KERNEL "kernel" -#define LIB_NAME_FOR_KERNEL "liblinuxkernel.so" -#define MAX_SOCK_FOR_KERNEL (MAX_SOCKET_NUM-1) - -#define MIN_SOCK_FOR_KERNEL 0 - -#define LIB_NAME_FOR_STACKX "libnstack.so" -#define MAX_SOCK_FOR_STACKX MAX_SOCKET_NUM - #define MIN_SOCK_FOR_STACKX 0 #define MOD_PRI_FOR_STACKX 1 diff --git a/src/nSocket/nstack/nstack_nsocket_construct.c b/src/nSocket/nstack/nstack_nsocket_construct.c index 31f2b55..0b447b7 100644 --- a/src/nSocket/nstack/nstack_nsocket_construct.c +++ b/src/nSocket/nstack/nstack_nsocket_construct.c @@ -40,4 +40,4 @@ NSFW_MODULE_INIT (nstack_app_init) /* *INDENT-OFF* */ } /* *INDENT-ON* */ -#endif /* __cplusplus */
\ No newline at end of file +#endif /* __cplusplus */ diff --git a/src/nSocket/nstack/nstack_socket.c b/src/nSocket/nstack/nstack_socket.c index d32958c..5c3cacb 100644 --- a/src/nSocket/nstack/nstack_socket.c +++ b/src/nSocket/nstack/nstack_socket.c @@ -149,7 +149,6 @@ nstack_socket (int domain, int itype, int protocol) nstack_rd_key rdkey = { 0 }; int selectmod = -1; - /*check whether module init finish or not */ NSTACK_INIT_CHECK_RET (socket); @@ -288,7 +287,6 @@ nstack_bind (int fd, const struct sockaddr *addr, socklen_t addrlen) struct sockaddr_in *iaddr = NULL; nstack_rd_key rdkey = { 0 }; - NSSOC_LOGINF ("(sockfd=%d, addr=%p, addrlen=%u) [Caller]", fd, addr, addrlen); @@ -1140,7 +1138,7 @@ nstack_send (int fd, const void *buf, size_t len, int flags) return -1; } - NSTACK_CAL_FUN(fdInf->ops, send, (fdInf->rlfd, buf, len, flags), size); + NSTACK_CAL_FUN (fdInf->ops, send, (fdInf->rlfd, buf, len, flags), size); NSSOC_LOGDBG ("fd=%d,ret=%d [Return]", fd, size); @@ -1173,7 +1171,7 @@ nstack_recv (int fd, void *buf, size_t len, int flags) return -1; } - NSTACK_CAL_FUN(fdInf->ops, recv, (fdInf->rlfd, buf, len, flags), size); + NSTACK_CAL_FUN (fdInf->ops, recv, (fdInf->rlfd, buf, len, flags), size); NSSOC_LOGDBG ("fd=%d,ret=%d [Return]", fd, size); @@ -1205,7 +1203,7 @@ nstack_write (int fd, const void *buf, size_t count) return -1; } - NSTACK_CAL_FUN(fdInf->ops, write, (fdInf->rlfd, buf, count), size); + NSTACK_CAL_FUN (fdInf->ops, write, (fdInf->rlfd, buf, count), size); NSSOC_LOGDBG ("fd=%d,ret=%d [Return]", fd, size); @@ -1236,7 +1234,7 @@ nstack_read (int fd, void *buf, size_t count) return -1; } - NSTACK_CAL_FUN(fdInf->ops, read, (fdInf->rlfd, buf, count), size); + NSTACK_CAL_FUN (fdInf->ops, read, (fdInf->rlfd, buf, count), size); NSSOC_LOGDBG ("fd=%d,ret=%d [Return]", fd, size); @@ -1268,8 +1266,7 @@ nstack_writev (int fd, const struct iovec * iov, int iovcnt) return -1; } - - NSTACK_CAL_FUN(fdInf->ops, writev, (fdInf->rlfd, iov, iovcnt), size); + NSTACK_CAL_FUN (fdInf->ops, writev, (fdInf->rlfd, iov, iovcnt), size); NSSOC_LOGDBG ("fd=%d,ret=%d [Return]", fd, size); @@ -1301,7 +1298,7 @@ nstack_readv (int fd, const struct iovec * iov, int iovcnt) return -1; } - NSTACK_CAL_FUN(fdInf->ops, readv, (fdInf->rlfd, iov, iovcnt), size); + NSTACK_CAL_FUN (fdInf->ops, readv, (fdInf->rlfd, iov, iovcnt), size); NSSOC_LOGDBG ("fd=%d,ret=%d [Return]", fd, size); @@ -1335,7 +1332,9 @@ nstack_sendto (int fd, const void *buf, size_t len, int flags, if (fdInf->ops) { - NSTACK_CAL_FUN(fdInf->ops, sendto, (fdInf->rlfd, buf, len, flags, dest_addr, addrlen), size); + NSTACK_CAL_FUN (fdInf->ops, sendto, + (fdInf->rlfd, buf, len, flags, dest_addr, addrlen), + size); NSSOC_LOGDBG ("fdInf->ops:fd=%d buf=%p,len=%zu,size=%d,addr=%p [Return]", fd, buf, @@ -1421,7 +1420,7 @@ nstack_sendmsg (int fd, const struct msghdr * msg, int flags) /*if some module select, just connect */ if (fdInf->ops) { - NSTACK_CAL_FUN(fdInf->ops, sendmsg, (fdInf->rlfd, msg, flags), size); + NSTACK_CAL_FUN (fdInf->ops, sendmsg, (fdInf->rlfd, msg, flags), size); NSSOC_LOGDBG ("]fd=%d,size=%d msg=%p [Return]", fd, size, msg); UNLOCK_SEND (fd, local_lock); return size; @@ -1510,7 +1509,8 @@ nstack_recvfrom (int fd, void *buf, size_t len, int flags, return -1; } - NSTACK_CAL_FUN(fdInf->ops, recvfrom, (fdInf->rlfd, buf, len, flags, src_addr, addrlen), size); + NSTACK_CAL_FUN (fdInf->ops, recvfrom, + (fdInf->rlfd, buf, len, flags, src_addr, addrlen), size); NSSOC_LOGDBG ("fd=%d,retVal=%d [Return]", fd, size); @@ -1542,7 +1542,7 @@ nstack_recvmsg (int fd, struct msghdr * msg, int flags) return -1; } - NSTACK_CAL_FUN(fdInf->ops, recvmsg, (fdInf->rlfd, msg, flags), size); + NSTACK_CAL_FUN (fdInf->ops, recvmsg, (fdInf->rlfd, msg, flags), size); NSSOC_LOGDBG ("fd=%d,ret=%d [Return]", fd, size); @@ -2450,7 +2450,6 @@ nstack_epoll_create (int size) nstack_socket_ops *ops; int ret = 0; - NSTACK_INIT_CHECK_RET (epoll_create); NSSOC_LOGINF ("(size=%d) [Caller]", size); |