修复ethreader中的bug。原有代码没有在读取数据后释放锁，导致死锁。20150512

2 files changed, 3 insertions, 1 deletions

diff --git a/driver/nstat.c b/driver/nstat.c
index 91c1385..0451622 100644
--- a/driver/nstat.c
+++ b/driver/nstat.c
@@ -103,7 +103,7 @@ int nstat_init()
 

 	//Ethinfo shared memory

 	int shm_fd_ethinfo = shm_open(NSTAT_SHAREMEMORY_ETHSTAT_SYMBOL, O_RDWR|O_CREAT, SHM_FILEMODE);

-	ftruncate(shm_fd, sizeof(struct ethinfo_stat));

+	ftruncate(shm_fd_ethinfo, sizeof(struct ethinfo_stat));

 

 	void * shm_ptr_ethinfo = mmap(NULL, sizeof(struct ethinfo_stat), PROT_READ | PROT_WRITE,

 						  MAP_SHARED, shm_fd_ethinfo, 0);

diff --git a/logreader/ethreader/ethreader.c b/logreader/ethreader/ethreader.c
index 40e9a37..199d565 100644
--- a/logreader/ethreader/ethreader.c
+++ b/logreader/ethreader/ethreader.c
@@ -68,6 +68,8 @@ void nic_stats_display(int port_id)
 #endif
 	printf("  %s############################%s\n",
 	       nic_stats_border, nic_stats_border);
+
+	rte_rwlock_read_unlock(&ethinfo_handle->rwlock);
 }