Merge pull request #4 from tiglabs/master

update

Author: chenshugang

kdns/src/forward.c

@@ -303,23 +303,28 @@ int remote_sock_init(char * fwd_addrs, char * fwd_def_addr,int fwd_threads){
     /* create a separate thread to send task status as quick as possible */
     int i =0;
     for( ;i< fwd_threads;i++){
-          int * remote_sock =    (int *)  xalloc(sizeof(int));
-          pthread_t *thread_id = (pthread_t *)  xalloc(sizeof(pthread_t));  
-         *remote_sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); 
-         struct timeval tv = {2, 0};
-         
-         if (setsockopt(*remote_sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) < 0) {  
-             
-             log_msg(LOG_ERR,"socket option  SO_RCVTIMEO not support\n");  
-             exit(-1);  
-         } 
-
-         pthread_create(thread_id, NULL, thread_fwd_pkt_process, (void*)remote_sock);
+        int * remote_sock =    (int *)  xalloc(sizeof(int));
+        pthread_t *thread_id = (pthread_t *)  xalloc(sizeof(pthread_t));  
+        *remote_sock = socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP); 
+        struct timeval tv = {2, 0};
+
+        if (setsockopt(*remote_sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv)) < 0) {  
+
+            log_msg(LOG_ERR,"socket option  SO_RCVTIMEO not support\n");  
+            exit(-1);  
+        } 
+
+        pthread_create(thread_id, NULL, thread_fwd_pkt_process, (void*)remote_sock);
+
+        char tname[16];
+        snprintf(tname, sizeof(tname), "kdns_udp_fwd_%d", i);
+        pthread_setname_np(*thread_id, tname);
     }
- 
-     // cache date expired clean up thread
-     pthread_t *thread_cache_expired = (pthread_t *)  xalloc(sizeof(pthread_t));  
-     pthread_create(thread_cache_expired, NULL, thread_fwd_cache_expired_cleanup, (void*)NULL);
+
+    // cache date expired clean up thread
+    pthread_t *thread_cache_expired = (pthread_t *)  xalloc(sizeof(pthread_t));  
+    pthread_create(thread_cache_expired, NULL, thread_fwd_cache_expired_cleanup, (void*)NULL);
+    pthread_setname_np(*thread_cache_expired, "kdns_fwd_cache");
 
     return 0;
 }

kdns/src/main.c

@@ -1,3 +1,5 @@
+#define _GNU_SOURCE
+#include <pthread.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
@@ -114,45 +116,83 @@ static void init_signals(void)
 	sigaction(SIGUSR2, &sigact, NULL);
 }
 
+static int set_thread_affinity(void)
+{
+    int s;
+    uint8_t cid;
+    pthread_t tid;
+    cpu_set_t cpuset;
+    unsigned long long cpumask = 0;
+
+    tid = pthread_self();
+    CPU_ZERO(&cpuset);
+    for (cid = 0; cid < RTE_MAX_LCORE; ++cid) {
+        if (!rte_lcore_is_enabled(cid)) {
+            CPU_SET(cid, &cpuset);
+        }
+    }
+
+    s = pthread_setaffinity_np(tid, sizeof(cpu_set_t), &cpuset);
+    if (s != 0) {
+        log_msg(LOG_ERR, "fail to set thread affinty, errno=%d, errinfo=%s\n", errno, strerror(errno));
+        return -1;
+    }
+
+    CPU_ZERO(&cpuset);
+    s = pthread_getaffinity_np(tid, sizeof(cpu_set_t), &cpuset);
+    if (s != 0) {
+        log_msg(LOG_ERR, "fail to get thread affinity, errno=%d, errinfo=%s\n", errno, strerror(errno));
+        return -2;
+    }
+
+    for (cid = 0; cid < RTE_MAX_LCORE; cid++) {
+        if (CPU_ISSET(cid, &cpuset)) {
+            cpumask |= (1LL << cid);
+        }
+    }
+    log_msg(LOG_INFO, "current thread affinity is set to %llX\n", cpumask);
+
+    return 0;
+}
 
 int  main(int argc, char **argv)
 { 
-    dns_procname = parse_progname(argv[0]);
-
-    parse_args(argc, argv);
     if (check_pid(PIDFILE) < 0) {
-         exit(0);
+        exit(0);
     }
     write_pid(PIDFILE);
-    
+
+    dns_procname = parse_progname(argv[0]);
+    parse_args(argc, argv);
     config_file_load(dns_cfgfile,dns_procname);
-    
+
     log_open(g_dns_cfg->comm.log_file);
-    
+
     dns_dpdk_init();
-    
-    unsigned lcore_id = rte_lcore_id();
 
-    remote_sock_init(g_dns_cfg->comm.fwd_addrs,g_dns_cfg->comm.fwd_def_addrs,g_dns_cfg->comm.fwd_threads);
+    if (set_thread_affinity() != 0) {
+        log_msg(LOG_ERR, "set_thread_affinity failed\n");
+        exit(EXIT_FAILURE);
+    }
 
+    remote_sock_init(g_dns_cfg->comm.fwd_addrs,g_dns_cfg->comm.fwd_def_addrs,g_dns_cfg->comm.fwd_threads);
 
     netif_queue_core_bind();
 
-   // struct sigaction action;
-	/* Setup the signal handling... */
-   init_signals();
-   rte_pdump_init("/var/run/.dpdk");
-    
+    // struct sigaction action;
+    /* Setup the signal handling... */
+    init_signals();
+    rte_pdump_init("/var/run/.dpdk");
 
+    unsigned lcore_id;
     RTE_LCORE_FOREACH_SLAVE(lcore_id) {     
-        if(kdns_init(lcore_id) < 0){
+        if (kdns_init(lcore_id) < 0) {
             log_msg(LOG_ERR, "Error:kdns_init lcore_id =%d\n",lcore_id); 
             exit(-1);
         }
         rte_eal_remote_launch(process_slave, NULL, lcore_id);
     }
 
-
     dns_tcp_process_init(g_dns_cfg->netdev.kni_vip);
 
     process_master(NULL);

kdns/src/tcp_process.c

@@ -273,8 +273,9 @@ int dns_tcp_process_init(char *ip){
         return -1;
     }
 
-    pthread_t *thread_cache_expired = (pthread_t *)  xalloc(sizeof(pthread_t));  
-    pthread_create(thread_cache_expired, NULL, dns_tcp_process, (void*)ip);
+    pthread_t *thread_tcp_process = (pthread_t *)  xalloc(sizeof(pthread_t));  
+    pthread_create(thread_tcp_process, NULL, dns_tcp_process, (void*)ip);
+    pthread_setname_np(*thread_tcp_process, "kdns_tcp_proc");
     return 0;
 }