Feature: 19.04 part 1

Change-Id: Ibba924b8deca1f246b9dcb12d89d085b6fd33046
Signed-off-by: charan makkina <charan795m@gmail.com>

1 files changed, 26 insertions, 56 deletions

diff --git a/src/nSocket/include/select_adapt.h b/src/nSocket/include/select_adapt.h
index 2898c76..b655cf8 100644
--- a/src/nSocket/include/select_adapt.h
+++ b/src/nSocket/include/select_adapt.h
@@ -14,51 +14,23 @@
 * limitations under the License.
 */
 
-/*==============================================*
- *      include header files                    *
- *----------------------------------------------*/
-
-/*==============================================*
- *      constants or macros define              *
- *----------------------------------------------*/
-
-/*==============================================*
- *      project-wide global variables           *
- *----------------------------------------------*/
-
-/*==============================================*
- *      routines' or functions' implementations *
- *----------------------------------------------*/
-
 #ifndef __SELECT_ADAPT_H__
 #define __SELECT_ADAPT_H__
 
 #include "types.h"
 #include "nstack_module.h"
-#include "common_mem_spinlock.h"
 #include "nstack_securec.h"
-#include "common_func.h"
-
-#define SBR_MAX_FD_NUM MAX_SOCKET_NUM
-
-#define NSTACK_SELECT_MAX_FD    8192
-#define NSTACK_SETSIZE  8192
+#include "dmm_spinlock.h"
+#include "nsfw_maintain_api.h"
 
-#define FREE_FD_SET(readfd, writefd, exceptfd)  {\
-    if(readfd)\
-        free(readfd);\
-    if(writefd)\
-        free(writefd);\
-    if(exceptfd)\
-        free(exceptfd);\
-}
+#define NSTACK_SELECT_MAX_FD    MAX_SOCKET_NUM  //CFG(CFG_MAX_SOCKET_NUM)
 
 typedef sem_t select_sem_t;
-typedef common_mem_spinlock_t select_spinlock_t;
+typedef dmm_spinlock_t select_spinlock_t;
 
-#define select_spin_lock(lock)         (common_mem_spinlock_lock((lock)))
-#define select_spin_unlock(lock)     (common_mem_spinlock_unlock((lock)))
-#define select_spin_lock_init(lock)   (common_mem_spinlock_init((lock)))
+#define select_spin_lock(lock)         (dmm_spin_lock((lock)))
+#define select_spin_unlock(lock)     (dmm_spin_unlock((lock)))
+#define select_spin_lock_init(lock)   (dmm_spin_init((lock)))
 
 #define  select_sem_wait(sem)                       (sem_wait((sem)))
 #define  select_sem_init(sem,  share,  val)      (sem_init((sem), (share), (val)))
@@ -66,40 +38,38 @@ typedef common_mem_spinlock_t select_spinlock_t;
 
 /*************input form other modules***************************/
 extern nstack_module_info g_nstack_modules;
-#define get_mode_num()                        (g_nstack_modules.modNum)
-#define get_mode_linux_index()              (g_nstack_modules.fix_mid)
 
 struct select_comm_fd_map
 {
-  i32 mod_fd[NSTACK_MAX_MODULE_NUM];    //save modules fd
-  i32 index;                    //-1 mean not select modules
+    i32 mod_fd[NSTACK_MAX_MODULE_NUM];  //save modules fd
+    i32 index;                  //-1 mean not select modules
 };
 
 struct select_mod_fd_map
 {
-  i32 *comm_fd;                 //the fd app used
+    i32 *comm_fd;               //the fd app used
 };
 
 struct select_fd_map_inf
 {
 
-  struct select_comm_fd_map *fdinf;     //NSTACK_MAX_SOCK_NUM
-  struct select_mod_fd_map modinf[NSTACK_MAX_MODULE_NUM];
+    struct select_comm_fd_map *fdinf;   //NSTACK_MAX_SOCK_NUM
+    struct select_mod_fd_map modinf[NSTACK_MAX_MODULE_NUM];
 
 };
-void *select_alloc (int size);
-void select_free (char *p);
-void reset_select_fdinf (i32 fd);
-i32 select_get_modfd (i32 fd, i32 inx);
-i32 select_set_modfd (i32 fd, i32 inx, i32 modfd);
-i32 select_get_modindex (i32 fd);
-i32 select_get_commfd (i32 modfd, i32 inx);
-i32 select_set_commfd (i32 modfd, i32 inx, i32 fd);
-i32 fdmapping_init (void);
-i32 select_set_index (i32 fd, i32 inx);
-i32 select_set_profd (i32 fd, i32 profd);
-void nssct_close (i32 cfd, i32 inx);
-void nssct_create (i32 cfd, i32 mfd, i32 inx);
-void nssct_set_index (i32 fd, i32 inx);
+void *select_alloc(int size);
+void select_free(void *p);
+void reset_select_fdinf(i32 fd);
+i32 select_get_modfd(i32 fd, i32 inx);
+i32 select_set_modfd(i32 fd, i32 inx, i32 modfd);
+i32 select_get_modindex(i32 fd);
+i32 select_get_commfd(i32 modfd, i32 inx);
+i32 select_set_commfd(i32 modfd, i32 inx, i32 fd);
+i32 fdmapping_init(void);
+i32 select_set_index(i32 fd, i32 inx);
+i32 select_set_profd(i32 fd, i32 profd);
+void nssct_close(i32 cfd, i32 inx);
+void nssct_create(i32 cfd, i32 mfd, i32 inx);
+void nssct_set_index(i32 fd, i32 inx);
 
 #endif