Merge branch 'fastnn' of github.com:Nerv-SJTU/nerv-speech into fastnnfastnn

1 files changed, 28 insertions, 2 deletions

diff --git a/htk_io/init.lua b/htk_io/init.lua
index b360b67..677d3e9 100644
--- a/htk_io/init.lua
+++ b/htk_io/init.lua
@@ -1,8 +1,9 @@
 require 'libhtkio'
 require 'speech_utils'
+require 'threads'
 local TNetReader = nerv.class("nerv.TNetReader", "nerv.DataReader")
 
-function TNetReader:__init(global_conf, reader_conf)
+function TNetReader:__init(global_conf, reader_conf, feat_repo_shareid, data_mutex_shareid)
     self.feat_id = reader_conf.id
     self.frm_ext = reader_conf.frm_ext
     self.gconf = global_conf
@@ -10,9 +11,22 @@ function TNetReader:__init(global_conf, reader_conf)
     if self.debug == nil then
         self.debug = false
     end
-    self.feat_repo = nerv.TNetFeatureRepo(reader_conf.scp_file,
+
+    if feat_repo_shareid ~= nil then
+	self.feat_repo = nerv.TNetFeatureRepo(feat_repo_shareid)
+    else
+    	self.feat_repo = nerv.TNetFeatureRepo(reader_conf.scp_file,
                                           reader_conf.conf_file,
                                           reader_conf.frm_ext)
+    end
+
+    --print(self.feat_repo)
+    self.data_mutex = nil
+    if data_mutex_shareid ~= nil then
+	self.data_mutex = threads.Mutex(data_mutex_shareid)
+    end
+	
+
     self.lab_repo = {}
     if reader_conf.mlfs then
         for id, mlf_spec in pairs(reader_conf.mlfs) do
@@ -26,7 +40,14 @@ function TNetReader:__init(global_conf, reader_conf)
 end
 
 function TNetReader:get_data()
+    if self.data_mutex ~= nil then
+	self.data_mutex:lock()
+    end
+
     if self.feat_repo:is_end() then
+	if self.data_mutex ~= nil then
+		self.data_mutex:unlock()
+	end
         return nil
     end
     local res = {}
@@ -66,6 +87,11 @@ function TNetReader:get_data()
     end
     -- move the pointer to next
     self.feat_repo:next()
+
+    if self.data_mutex ~= nil then
+        self.data_mutex:unlock()
+    end 
+
     collectgarbage("collect")
     return res
 end